r72460 - in /trunk/libapache2-mod-perl2/debian: changelog rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sun Apr 10 16:20:49 2011
New Revision: 72460

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72460
Log:
rules: pass CFLAGS to upstream make as MODPERL_OPTIMIZE, allowing
dpkg-buildpackage-induced CFLAGS to end up on the compiler command line

Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    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=72460&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Sun Apr 10 16:20:49 2011
@@ -41,6 +41,8 @@
   * add avoid-db-linkage.patch: avoids needless linking with libdb, which
     entangles us in libdb transitions. Closes: #621415
   * rules: pass --parallel to dh command allowing parallel builds
+  * rules: pass CFLAGS to upstream make as MODPERL_OPTIMIZE, allowing
+    dpkg-buildpackage-induced CFLAGS to end up on the compiler command line
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Tue, 22 Mar 2011 14:19:58 +0000
 

Modified: trunk/libapache2-mod-perl2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/rules?rev=72460&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (original)
+++ trunk/libapache2-mod-perl2/debian/rules Sun Apr 10 16:20:49 2011
@@ -6,12 +6,6 @@
 %:
 	dh $@ --parallel
 
-# 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 -- \
 		INSTALLDIRS=vendor \
@@ -19,11 +13,13 @@
 		MP_TRACE=0 \
 		MP_USE_DSO=1 \
 		MP_USE_STATIC=0 \
-		MP_CCOPTS="$(CFLAGS)" \
+		MP_CCOPTS="$(CFLAGS) -Wall" \
 		MP_INCLUDE_DIR=/usr/include/apache2 \
 		MP_APXS=/usr/bin/apxs2 \
-		MP_INCLUDE_DIR=/usr/include/apr-1.0 \
-		OPTIMIZE="$(CFLAGS)"
+		MP_INCLUDE_DIR=/usr/include/apr-1.0
+
+override_dh_auto_build:
+	dh_auto_build --parallel -- MODPERL_OPTIMIZE="$(CFLAGS)"
 
 override_dh_auto_test:
 	APACHE_TEST_EXTRA_ARGS="-httpd_conf /etc/apache2/apache2.conf"