From 0f20c384d5f3418f540be268f2d1533c9cf1a819 Mon Sep 17 00:00:00 2001 From: ed_ Date: Sun, 9 Dec 2007 19:03:39 +0000 Subject: [PATCH] rules: use BUILD_DEB_OPTIONS for n770 and n8x0 variants rules: use quilt instead of simple-patchsys control: quilt added to build-deps --- trunk/edje/debian/changelog | 7 +++++++ trunk/edje/debian/control | 2 +- trunk/edje/debian/rules | 13 +++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/trunk/edje/debian/changelog b/trunk/edje/debian/changelog index 5044684..851b9dc 100644 --- a/trunk/edje/debian/changelog +++ b/trunk/edje/debian/changelog @@ -1,3 +1,10 @@ +edje (0.5.0.041-maemo.3) unstable; urgency=low + + * rules: use BUILD_DEB_OPTIONS for n770 and n8x0 variants + * rules: use quilt instead of simple-patchsys + + -- Ed Bartosh Sun, 9 Dec 2007 20:53:21 +0200 + edje (0.5.0.041-maemo.2) unstable; urgency=low * rules: Include simple-patchsys.mk diff --git a/trunk/edje/debian/control b/trunk/edje/debian/control index 092ac27..c380186 100644 --- a/trunk/edje/debian/control +++ b/trunk/edje/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Maemo-EFL Team Suggests: edje0-bin -Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1), automake1.7 | automaken, libtool, libeet-dev, libecore-dev, libevas-dev, libembryo-dev +Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet-dev, libecore-dev, libevas-dev, libembryo-dev Standards-Version: 3.7.2 Package: edje0-bin diff --git a/trunk/edje/debian/rules b/trunk/edje/debian/rules index a8e3abc..f9bd3c1 100755 --- a/trunk/edje/debian/rules +++ b/trunk/edje/debian/rules @@ -2,10 +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 -I/usr/X11R6/include + ifneq (,$(findstring armel,$(DEB_BUILD_ARCH))) - DEB_CONFIGURE_SCRIPT_ENV += 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" + 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 + -- 1.7.9.5