rules: use BUILD_DEB_OPTIONS for n770 and n8x0 variants

rules: use quilt instead of simple-patchsys

diff --git a/trunk/embryo/debian/changelog b/trunk/embryo/debian/changelog
index 76c337b..47d3916 100644 (file)
--- a/trunk/embryo/debian/changelog
+++ b/trunk/embryo/debian/changelog
@@ -1,3 +1,11 @@
+embryo (0.9.1.041-maemo.3) unstable; urgency=low
+
+  * rules: use BUILD_DEB_OPTIONS for n770 and n8x0 variants
+  * rules: use quilt instead of simple-patchsys
+  * control: dependencies to cdbs and quilt added
+
+ -- Ed Bartosh <bartosh@gmail.com>  Sun,  9 Dec 2007 20:06:02 +0200
+
 embryo (0.9.1.041-maemo.2) unstable; urgency=low
 
   * rules: Include simple-patchsys.mk

diff --git a/trunk/embryo/debian/control b/trunk/embryo/debian/control
index ee9864a..1a5e251 100644 (file)
--- a/trunk/embryo/debian/control
+++ b/trunk/embryo/debian/control
@@ -2,7 +2,7 @@ Source: embryo
 Section: libs
 Priority: optional
 Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>= 4.0.0), automake1.7 | automaken, libtool
+Build-Depends: debhelper (>= 4.0.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool
 Standards-Version: 3.7.2
 
 Package: embryo0-bin

diff --git a/trunk/embryo/debian/rules b/trunk/embryo/debian/rules
index e7bf183..4efb562 100755 (executable)
--- a/trunk/embryo/debian/rules
+++ b/trunk/embryo/debian/rules
@@ -2,11 +2,19 @@
 
 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_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2
+                                                                                 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       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
+        CFLAGS += -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