package libcairo
tags 399868 patch
thanks
Hi Tommi, Dave,
I'm including a new patch which always passes -g (per policy, packages
_should_ include debugging symbols in the build tree), and with the
previous patch this was a regression, changes the deprecated debug
DEB_BUILD_OPTIONS to noopt, passes the flags in the command line
instead of using env, and does not pass LDFLAGS as it's not defined
in the rules file. It'd be good to add -Wall to the first CFLAGS
assignations, though.
There's some other things in the rules file which could be fixed
- DH_COMPAT should be a temporary override over debian/compat.
- INSTALL_PROGRAM can be removed, as you don't use it, and debhelper
takes care of this.
- the CONFFLAGS stuff is written for autoconf 2.13, but the package
uses autoconf 2.60.
- there's some other unused variables and PHONY targets.
- the references to directfb -dev package versions are outdated.
and I could file a bug report with a patch if you want, Dave.
regards,
guillem
--- debian/rules 2006-11-24 03:53:22.000000000 +0200
+++ debian/rules 2006-11-24 03:57:48.000000000 +0200
@@ -48,10 +48,15 @@ export DH_COMPAT=5
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g -O0
+CFLAGS = -g
+CFLAGS_UDEB = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+ CFLAGS_UDEB += -O0
else
CFLAGS += -O2
+ CFLAGS_UDEB += -Os
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
@@ -93,7 +98,9 @@ configure-main-stamp: configure-common-s
dh_testdir
mkdir -p $(MAIN_BUILD_DIR); \
cd $(MAIN_BUILD_DIR); \
- $(SRC_DIR)/configure $(CONFFLAGS) \
+ $(SRC_DIR)/configure \
+ CFLAGS="$(CFLAGS)" \
+ $(CONFFLAGS) \
--prefix=$(prefix) \
--mandir=$(share)/man \
--infodir=$(share)/info \
@@ -105,7 +112,9 @@ configure-udeb-stamp: configure-common-s
dh_testdir
mkdir -p $(DIRECTFB_BUILD_DIR); \
cd $(DIRECTFB_BUILD_DIR); \
- $(SRC_DIR)/configure $(CONFFLAGS) \
+ $(SRC_DIR)/configure \
+ CFLAGS="$(CFLAGS_UDEB)" \
+ $(CONFFLAGS) \
--prefix=$(DIRECTFB_PREFIX) \
--mandir=$(share)/man \
--infodir=$(share)/info \
