From: etrunko Date: Mon, 7 Jul 2008 14:27:41 +0000 (+0000) Subject: Try to guess the target system automatically X-Git-Url: http://vcs.maemo.org/git/?p=maemo-efl;a=commitdiff_plain;h=53fefad7bcd02cd2a2a63e9a4b7e18b89fe475bc Try to guess the target system automatically --- diff --git a/trunk/edje/debian/changelog b/trunk/edje/debian/changelog index ccabc30..47a03e5 100644 --- a/trunk/edje/debian/changelog +++ b/trunk/edje/debian/changelog @@ -1,3 +1,10 @@ +edje (0.5.0.042-maemo5) unstable; urgency=low + + * debian/rules: Try to guess the target device in a bit more clever way. + * debian/control: Fix build dependency info. + + -- Eduardo Lima (Etrunko) Thu, 03 Jul 2008 16:05:28 -0300 + edje (0.5.0.042-maemo4) unstable; urgency=low * New release. diff --git a/trunk/edje/debian/control b/trunk/edje/debian/control index e2459a7..defc227 100644 --- a/trunk/edje/debian/control +++ b/trunk/edje/debian/control @@ -3,13 +3,13 @@ Section: libs Priority: optional Maintainer: Maemo-EFL Team Suggests: edje0-bin -Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1), automake1.7 | automaken, libtool, libeet1-dev (>= 1.0.0), libecore0-dev (>= 0.9.9.042-maemo3), libevas0-dev (>= 0.9.9.042-maemo3), libembryo0-dev (>= 0.9.1.042-maemo2) +Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1), automake1.7 | automaken, libtool, libeet1-dev (>= 1.0.0-maemo2), libecore0-dev (>= 0.9.9.042-maemo4), libevas0-dev (>= 0.9.9.042-maemo4), libembryo0-dev (>= 0.9.1.042-maemo3) Standards-Version: 3.7.2 Package: edje0-bin Architecture: any Section: graphics -Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version}), embryo0-bin (>= 0.9.1.042-maemo2), libevas0-loader-png (>= 0.9.9.042-maemo3), libevas0-loader-jpeg (>= 0.9.9.042-maemo3), libevas0-engine-buffer (>= 0.9.9.042-maemo3) +Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version}), embryo0-bin (>= 0.9.1.042-maemo3), libevas0-loader-png (>= 0.9.9.042-maemo4), libevas0-loader-jpeg (>= 0.9.9.042-maemo4), libevas0-engine-buffer (>= 0.9.9.042-maemo4) Provides: edje-bin Description: Various binaries for use with Edje Edje is a graphical layout and animation library for animated resizable, @@ -26,7 +26,7 @@ Description: Various binaries for use with Edje Package: libedje0 Architecture: any Section: libs -Depends: ${shlibs:Depends}, libevas0-loader-eet (>= 0.9.9.042-maemo3) +Depends: ${shlibs:Depends}, libevas0-loader-eet (>= 0.9.9.042-maemo4) Provides: libedje Suggests: edje-bin (= ${Source-Version}) Description: Graphical layout and animation library @@ -48,7 +48,7 @@ Description: Graphical layout and animation library Package: libedje0-dev Architecture: any Section: libdevel -Depends: libedje0 (= ${Source-Version}), libeet1-dev (>= 1.0.0), libecore0-dev (>= 0.9.9.042-maemo3), libevas0-dev (>= 0.9.9.042-maemo3), libembryo0-dev (>= 0.9.1.042-maemo2) +Depends: libedje0 (= ${Source-Version}), libeet1-dev (>= 1.0.0-maemo2), libecore0-dev (>= 0.9.9.042-maemo4), libevas0-dev (>= 0.9.9.042-maemo4), libembryo0-dev (>= 0.9.1.042-maemo3) Provides: libedje-dev Description: Edje headers, static libraries and documentation Edje is a graphical layout and animation library for animated resizable, diff --git a/trunk/edje/debian/rules b/trunk/edje/debian/rules index e547a5b..7c79469 100755 --- a/trunk/edje/debian/rules +++ b/trunk/edje/debian/rules @@ -3,14 +3,43 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -ifneq (,$(findstring armel,$(DEB_BUILD_ARCH))) - CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant - ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS))) - CFLAGS += -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s - endif - ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS))) - CFLAGS += -mcpu=arm926ej-s +ifeq ($(DEB_BUILD_ARCH),armel) + COMMON_CFLAGS=-DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant + N770_CFLAGS=-mcpu=arm926ej-s + N8x0_CFLAGS=-mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s + ifneq ($(DEB_BUILD_OPTIONS),) + ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS))) + SPECIFIC_CFLAGS=$(N8x0_CFLAGS) + else + ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS))) + SPECIFIC_CFLAGS=$(N770_CFLAGS) + endif + endif endif + ifeq ($(SPECIFIC_CFLAGS),) + ifeq (0,$(shell test -e /etc/osso_software_version; echo $$?)) + SW_VERSION?=$(shell cat /etc/osso_software_version|cut -d_ -f2) + ifneq (,$(findstring $(SW_VERSION),OSSO1.1 2008SE DIABLO)) + SPECIFIC_CFLAGS=$(N8x0_CFLAGS) + endif + endif + ifeq ($(SPECIFIC_CFLAGS),) + # Our last hope is to look at the value returned by `sb-conf current` + SB_CURRENT?=$(shell sb-conf current|cut -d_ -f1) + ifneq (,$(findstring $(SB_CURRENT),GREGALE BORA CHINOOK DIABLO)) + ifeq ($(SB_CURRENT),GREGALE) + SPECIFIC_CFLAGS=$(N770_CFLAGS) + else + SPECIFIC_CFLAGS=$(N8x0_CFLAGS) + endif + else + COMMON_CFLAGS= + endif + endif + endif endif + +CFLAGS+=$(COMMON_CFLAGS) $(SPECIFIC_CFLAGS) +