From 379ae98269afceed52f51a942daa398151bcdbfb Mon Sep 17 00:00:00 2001 From: etrunko Date: Mon, 7 Jul 2008 14:29:40 +0000 Subject: [PATCH] Try to guess the target system automatically --- trunk/e_dbus/debian/changelog | 7 ++++++ trunk/e_dbus/debian/control | 6 ++--- trunk/e_dbus/debian/rules | 49 ++++++++++++++++++++++++++++--------- trunk/e_dbus/debian_chinook/rules | 49 ++++++++++++++++++++++++++++--------- 4 files changed, 86 insertions(+), 25 deletions(-) diff --git a/trunk/e_dbus/debian/changelog b/trunk/e_dbus/debian/changelog index dcb7124..e9cf205 100644 --- a/trunk/e_dbus/debian/changelog +++ b/trunk/e_dbus/debian/changelog @@ -1,3 +1,10 @@ +e-dbus (0.1.0.042-maemo4) 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 + e-dbus (0.1.0.042-maemo3) unstable; urgency=low * New release. diff --git a/trunk/e_dbus/debian/control b/trunk/e_dbus/debian/control index 3e396b5..d458f17 100644 --- a/trunk/e_dbus/debian/control +++ b/trunk/e_dbus/debian/control @@ -2,13 +2,13 @@ Source: e-dbus Section: libs Priority: optional Maintainer: Maemo-EFL Team -Build-Depends: cdbs, debhelper (>= 4), libecore0-dev (>= 0.9.9.042-maemo3), libdbus-1-dev +Build-Depends: cdbs, debhelper (>= 4), libecore0-dev (>= 0.9.9.042-maemo4), libdbus-1-dev Standards-Version: 3.7.2 Package: libedbus0-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, libedbus0 (= ${Source-Version}), libecore0-dev (>= 0.9.9.042-maemo3), libdbus-1-dev +Depends: ${shlibs:Depends}, libedbus0 (= ${Source-Version}), libecore0-dev (>= 0.9.9.042-maemo4), libdbus-1-dev Provides: libedbus-dev Description: D-Bus and HAL wrapper libraries for use with the EFL - Development files Wrappers around D-Bus to ease integrating D-Bus with EFL based applications. @@ -17,7 +17,7 @@ Description: D-Bus and HAL wrapper libraries for use with the EFL - Development Package: libedbus0 Architecture: any -Depends: ${shlibs:Depends}, libecore0 (>= 0.9.9.042-maemo3), libdbus-1-2 | libdbus-1-3 +Depends: ${shlibs:Depends}, libecore0 (>= 0.9.9.042-maemo4), libdbus-1-2 | libdbus-1-3 Provides: libedbus Description: D-Bus and HAL wrapper libraries for use with the EFL Wrappers around D-Bus to ease integrating D-Bus with EFL based applications. diff --git a/trunk/e_dbus/debian/rules b/trunk/e_dbus/debian/rules index ae7bf76..2fcc209 100755 --- a/trunk/e_dbus/debian/rules +++ b/trunk/e_dbus/debian/rules @@ -4,19 +4,46 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_EXTRA_FLAGS := --disable-build-test-gui +DEB_CONFIGURE_EXTRA_FLAGS:=--disable-build-test-gui +CFLAGS+=-lpthread -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -CFLAGS += -lpthread - -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) + diff --git a/trunk/e_dbus/debian_chinook/rules b/trunk/e_dbus/debian_chinook/rules index 4fecb6a..5c2a962 100755 --- a/trunk/e_dbus/debian_chinook/rules +++ b/trunk/e_dbus/debian_chinook/rules @@ -3,19 +3,46 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -DEB_CONFIGURE_EXTRA_FLAGS := --disable-build-test-gui +DEB_CONFIGURE_EXTRA_FLAGS:=--disable-build-test-gui +CFLAGS+=-lpthread -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -CFLAGS += -lpthread - -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) + -- 1.7.9.5