rules: use BUILD_DEB_OPTIONS for n770 and n8x0 variants

rules: use quilt instead of simple-patchsys

diff --git a/trunk/ecore/debian/changelog b/trunk/ecore/debian/changelog
index bc1fa0b..70fe5aa 100644 (file)
--- a/trunk/ecore/debian/changelog
+++ b/trunk/ecore/debian/changelog
@@ -1,3 +1,10 @@
+ecore (0.9.9.041-maemo.4) unstable; urgency=low
+
+  * rules: use BUILD_DEB_OPTIONS for n770 and n8x0 variants
+  * rules: use quilt instead of simple-patchsys 
+
+ -- Ed Bartosh <bartosh@gmail.com>  Sun,  9 Dec 2007 19:04:32 +0200
+
 ecore (0.9.9.041-maemo.3) unstable; urgency=low
 
   * debian/rules: Include simple-patchsys.mk

diff --git a/trunk/ecore/debian/control b/trunk/ecore/debian/control
index ed4dd2b..3fe790a 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), libeet-dev, libevas-dev, libssl-dev, libcurl3-dev, libxcursor-dev, xlibs-dev, libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, x-dev, libfreetype6-dev, libjpeg62-dev
+Build-Depends: cdbs, quilt, debhelper (>= 4), libeet-dev, libevas-dev, libssl-dev, libcurl3-dev, libxcursor-dev, xlibs-dev, libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, x-dev, libfreetype6-dev, libjpeg62-dev
 Standards-Version: 3.7.2
 
 Package: libecore0

diff --git a/trunk/ecore/debian/rules b/trunk/ecore/debian/rules
index c5eefb6..45e0179 100755 (executable)
--- a/trunk/ecore/debian/rules
+++ b/trunk/ecore/debian/rules
@@ -2,7 +2,7 @@
 
 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
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-ecore-evas-x11-16       \
                                                          --disable-ecore-fb                    \
@@ -18,7 +18,14 @@ DEB_CONFIGURE_SCRIPT_ENV += CURL_LIBS="-lcurl"
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2
+                                                                                
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS := $(CFLAGS) -DNDEBUG=1 -fomit-frame-pointer -O2 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -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
+       endif
 endif