Try to guess the target system automatically

diff --git a/trunk/ecore/debian/changelog b/trunk/ecore/debian/changelog
index efe5bfd..1676859 100644 (file)
--- a/trunk/ecore/debian/changelog
+++ b/trunk/ecore/debian/changelog
@@ -1,3 +1,10 @@
+ecore (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) <eduardo.lima@indt.org.br>  Thu, 03 Jul 2008 16:05:28 -0300
+
 ecore (0.9.9.042-maemo3) unstable; urgency=low
 
   * New release.

diff --git a/trunk/ecore/debian/control b/trunk/ecore/debian/control
index 504d823..a08fe4a 100644 (file)
--- a/trunk/ecore/debian/control
+++ b/trunk/ecore/debian/control
@@ -2,7 +2,7 @@ Source: ecore
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: cdbs, debhelper (>= 4), libeet1-dev (>= 1.0.0), libevas0-dev (>= 0.9.9.042-maemo3), libssl-dev, libcurl3-dev, libxcursor-dev, x-dev | libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, libfreetype6-dev, libjpeg62-dev
+Build-Depends: cdbs, debhelper (>= 4), libeet1-dev (>= 1.0.0-maemo2), libevas0-dev (>= 0.9.9.042-maemo4), libssl-dev, libcurl3-dev, libxcursor-dev, x-dev | libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, libfreetype6-dev, libjpeg62-dev
 Standards-Version: 3.7.2
 
 Package: libecore0
@@ -19,7 +19,7 @@ Description: Core abstraction layer for enlightenment DR 0.17
 Package: libecore0-con
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libssl0.9.7
+Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libssl0.9.7|libssl0.9.8
 Provides: libecore-con
 Description: Ecore Connection Library
  This is the core event abstraction layer and X abstraction layer that makes
@@ -33,7 +33,7 @@ Description: Ecore Connection Library
 #Package: libecore0-config
 #Architecture: any
 #Section: libs
-#Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libevas0 (>= 0.9.9.042-maemo3), libeet1  (>= 1.0.0)
+#Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libevas0 (>= 0.9.9.042-maemo4), libeet1  (>= 1.0.0-maemo2)
 #Provides: libecore-config
 #Description: Ecore Enlightened Property Library
 # This is the core event abstraction layer and X abstraction layer that makes
@@ -61,7 +61,7 @@ Description: Ecore freedesktop.org .desktop, icon, menu parsing Library
 Package: libecore0-evas
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libecore0-x (= ${Source-Version}), libecore0-txt (= ${Source-Version}), libecore0-job (= ${Source-Version}), libevas0 (>= 0.9.9.042-maemo3), libx11-6, libxext6, libevas0-engine-software-x11 (>= 0.9.9.042-maemo3), libevas0-engine-software-x11-16 (>= 0.9.9.042-maemo3)
+Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libecore0-x (= ${Source-Version}), libecore0-txt (= ${Source-Version}), libecore0-job (= ${Source-Version}), libevas0 (>= 0.9.9.042-maemo4), libx11-6, libxext6, libevas0-engine-software-x11 (>= 0.9.9.042-maemo4), libevas0-engine-software-x11-16 (>= 0.9.9.042-maemo4)
 Provides: libecore-evas
 Description: Ecore Evas Wrapper Library
  This is the core event abstraction layer and X abstraction layer that makes
@@ -206,7 +206,7 @@ Package: libecore0-dev
 Architecture: any
 Section: libdevel
 Architecture: any
-Depends: libecore0 (= ${Source-Version}), libevas0-dev (>= 0.9.9.042-maemo3), libecore0-all (= ${Source-Version})
+Depends: libecore0 (= ${Source-Version}), libevas0-dev (>= 0.9.9.042-maemo4), libecore0-all (= ${Source-Version})
 Provides: libecore-dev
 Description: Ecore headers, static libraries and documentation
  This is the core event abstraction layer and X abstraction layer that makes

diff --git a/trunk/ecore/debian/rules b/trunk/ecore/debian/rules
index 95d2c4d..e7b966a 100755 (executable)
--- a/trunk/ecore/debian/rules
+++ b/trunk/ecore/debian/rules
@@ -16,17 +16,45 @@ DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-ecore-evas-x11-16    \
 
 DEB_CONFIGURE_SCRIPT_ENV += CURL_LIBS="-lcurl"
 
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
 CFLAGS += -I/usr/X11R6/include
 
-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
+DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+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)
+