From 36a5891ab133ff433b1928cb08dd36b0a781596d Mon Sep 17 00:00:00 2001 From: etrunko Date: Thu, 3 Jul 2008 21:22:27 +0000 Subject: [PATCH] Try to guess the target system automatically --- trunk/evas/debian/changelog | 7 +++++++ trunk/evas/debian/control | 8 ++++---- trunk/evas/debian/rules | 45 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/trunk/evas/debian/changelog b/trunk/evas/debian/changelog index 154b018..d38f804 100644 --- a/trunk/evas/debian/changelog +++ b/trunk/evas/debian/changelog @@ -1,3 +1,10 @@ +evas (0.9.9.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 + evas (0.9.9.042-maemo3) unstable; urgency=low * New release. diff --git a/trunk/evas/debian/control b/trunk/evas/debian/control index 2fb7e7f..c9835e1 100644 --- a/trunk/evas/debian/control +++ b/trunk/evas/debian/control @@ -2,7 +2,7 @@ Source: evas Section: libs Priority: optional Maintainer: Maemo-EFL Team -Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet1-dev (>= 1.0.0), libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, zlib1g, libjpeg62-dev, autotools-dev +Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet1-dev (>= 1.0.0-maemo2), libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, zlib1g, libjpeg62-dev, autotools-dev, x11proto-xext-dev, libxext-dev Standards-Version: 3.7.2 #Homepage: http://www.enlightenment.org @@ -35,7 +35,7 @@ Description: enlightenment advanced canvas library Package: libevas0-dev Section: libdevel Architecture: any -Depends: libevas0 (= ${Source-Version}), libfreetype6-dev, zlib1g-dev, libjpeg-dev, libeet1-dev (>= 1.0.0) +Depends: libevas0 (= ${Source-Version}), libfreetype6-dev, zlib1g-dev, libjpeg-dev, libeet1-dev (>= 1.0.0-maemo2) Provides: libevas-dev Description: Enlightenment DR17 advanced canvas library development files Evas is an advanced canvas library, providing six engines for rendering: X11, @@ -158,7 +158,7 @@ Description: Evas module providing a buffer render engine Package: libevas0-loader-eet Section: libs Architecture: any -Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libeet1 (>= 1.0.0) +Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libeet1 (>= 1.0.0-maemo2) Provides: libevas-loader-eet Description: Evas module providing an Eet loader Evas is an advanced canvas library, providing six engines for rendering: X11, @@ -249,7 +249,7 @@ Description: Evas module providing a JPEG loader Package: libevas0-saver-eet Section: libs Architecture: any -Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libeet1 (>= 1.0.0) +Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libeet1 (>= 1.0.0-maemo2) Provides: libevas-saver-eet Description: Evas module providing an Eet saver Evas is an advanced canvas library, providing six engines for rendering: X11, diff --git a/trunk/evas/debian/rules b/trunk/evas/debian/rules index c0de473..f52ef02 100755 --- a/trunk/evas/debian/rules +++ b/trunk/evas/debian/rules @@ -40,18 +40,45 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-software-16-x11 \ --disable-convert-32-rgb-rot-90 \ --disable-sdl -CFLAGS += -I/usr/X11R6/include +CFLAGS+=-I/usr/X11R6/include -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) -- 1.7.9.5