From db3b1c7718d45aa2d025f18fd2930a98b15ded62 Mon Sep 17 00:00:00 2001 From: ed_ Date: Sun, 9 Dec 2007 20:06:38 +0000 Subject: [PATCH] rules: use BUILD_DEB_OPTIONS for n770 and n8x0 variants rules: use quilt instead of simple-patchsys --- trunk/epeg/debian/changelog | 7 +++++++ trunk/epeg/debian/control | 2 +- trunk/epeg/debian/rules | 13 +++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/trunk/epeg/debian/changelog b/trunk/epeg/debian/changelog index a6fd0c3..5b4ea78 100644 --- a/trunk/epeg/debian/changelog +++ b/trunk/epeg/debian/changelog @@ -1,3 +1,10 @@ +epeg (0.9.0.011-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 21:56:24 +0200 + epeg (0.9.0.011-maemo.2) unstable; urgency=low * rules: Include simple-patchsys.mk diff --git a/trunk/epeg/debian/control b/trunk/epeg/debian/control index 6024b73..3a4bd57 100644 --- a/trunk/epeg/debian/control +++ b/trunk/epeg/debian/control @@ -2,7 +2,7 @@ Source: epeg Section: libs Priority: optional Maintainer: Maemo-EFL Team -Build-Depends: cdbs, debhelper (>= 4), libjpeg62-dev +Build-Depends: cdbs, quilt, debhelper (>= 4), libjpeg62-dev Standards-Version: 3.7.2 Package: libepeg0-dev diff --git a/trunk/epeg/debian/rules b/trunk/epeg/debian/rules index f320fb5..495b7e2 100755 --- a/trunk/epeg/debian/rules +++ b/trunk/epeg/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 + 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 + -- 1.7.9.5