r72411 - in /trunk/libapache2-mod-perl2/debian: changelog control rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Apr  9 18:53:24 2011
New Revision: 72411

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72411
Log:
  a bit of CFLAGS/OPTIMIZE is implemented, but somewhere down the line the
  contents of $Config{optimize} (i.e. '-O2 -g') gets added

Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/control
    trunk/libapache2-mod-perl2/debian/rules

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=72411&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Sat Apr  9 18:53:24 2011
@@ -1,15 +1,17 @@
 libapache2-mod-perl2 (2.0.5-1) UNRELEASED; urgency=low
 
-  [ Nicholas Bamber ]
   TODO:
   - DEB_BUILD_OPTIONS=noopt needs:
-        1) $(CFLAGS) inserted in MP_CCFLAFS, and
+        1) $(CFLAGS) inserted in MP_CCFLAGS, and
         2) patch the build system so that MP_CCFLAGS is used *after*
            the default optimization flags (otherwise it is overriden by
            the defaults)
+    a bit of CFLAGS/OPTIMIZE is implemented, but somewhere down the line the
+    contents of $Config{optimize} (i.e. '-O2 -g') gets added
   - Still checking broken links in dwww
   - Check dependencies
 
+  [ Nicholas Bamber ]
   * Added myself to Uploaders
   * Upped debian compatibility level to 7, migrated to source format '3.0
     (quilt)' and removed quilt cruft

Modified: trunk/libapache2-mod-perl2/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/control?rev=72411&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/control (original)
+++ trunk/libapache2-mod-perl2/debian/control Sat Apr  9 18:53:24 2011
@@ -14,7 +14,8 @@
  debhelper (>= 7.0.50~), libwww-perl, libdevel-symdump-perl,
  libhtml-parser-perl, libgdbm-dev, libgtop2-dev, apache2, libcompress-zlib-perl,
  libbsd-resource-perl, locales-all, netbase, libhtml-template-perl,
- perl (>= 5.10.0-14) | libcgi-pm-perl (>= 3.33), libreadonly-perl
+ perl (>= 5.10.0-14) | libcgi-pm-perl (>= 3.33), libreadonly-perl,
+ dpkg-dev (>= 1.15.7~)
 Build-Conflicts: libapache2-mod-perl2 (<= 1.999.22-1)
 
 Package: libapache2-mod-perl2

Modified: trunk/libapache2-mod-perl2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/rules?rev=72411&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (original)
+++ trunk/libapache2-mod-perl2/debian/rules Sat Apr  9 18:53:24 2011
@@ -1,9 +1,16 @@
 #!/usr/bin/make -f
 
-TMP  := $(CURDIR)/debian/libapache2-mod-perl2
+PACKAGE = $(firstword $(shell dh_listpackages))
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 %:
 	dh $@
+
+# Allow disabling build optimation by setting noopt in
+# DEB_BUILD_OPTIONS
+# (dpkg-buildflags already honours DEB_BUILD_OPTIONS)
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -Wall
+export CFLAGS
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -12,15 +19,16 @@
 		MP_TRACE=0 \
 		MP_USE_DSO=1 \
 		MP_USE_STATIC=0 \
-		MP_CCOPTS="-g -Wall" \
+		MP_CCOPTS="$(CFLAGS)" \
 		MP_INCLUDE_DIR=/usr/include/apache2 \
 		MP_APXS=/usr/bin/apxs2 \
-		MP_INCLUDE_DIR=/usr/include/apr-1.0 
+		MP_INCLUDE_DIR=/usr/include/apr-1.0 \
+		OPTIMIZE="$(CFLAGS)"
 
 override_dh_auto_test:
 	APACHE_TEST_EXTRA_ARGS="-httpd_conf /etc/apache2/apache2.conf"
 		LANG=C \
-		dh_auto_test 
+		dh_auto_test
 
 override_dh_clean:
 	dh_clean