[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-47-gf2a09a2

[Andrew Pollock]

The following commit has been merged in the master branch:
commit f2a09a2af6022ca78b5bd4122597d29273049ed8
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Nov 19 20:46:07 2011 -0800

    Use dpkg-buildflags
    
    Switch debian/rules to use dpkg-buildflags, export CFLAGS
    Fixes FTBFS issues probably introduced by dpkg-buildflags integration with
    dpkg-buildpackage
    
    Closes: #643470

diff --git a/debian/changelog b/debian/changelog
index dc5f3be..f61339c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.2.2-2) unstable; urgency=low
+
+  * debian/rules: use dpkg-buildflags to set CFLAGS, and export CFLAGS (closes:
+    #643470)
+
+ -- Andrew Pollock <apollock at debian.org>  Sat, 19 Nov 2011 14:50:29 -0800
+
 isc-dhcp (4.2.2-1) unstable; urgency=low
 
   * New upstream release, includes security fixes for CVE-2011-2748 and
diff --git a/debian/rules b/debian/rules
index e03a7c1..b81c45c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,21 +22,18 @@ PACKAGE = isc-dhcp
 
 include /usr/share/dpatch/dpatch.make
 
-CFLAGS = -Wall -g
 INSTALL = install
 INSTALL_FILE 	= $(INSTALL) -p -o root -g root -m 644
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -Wall
 
 CFLAGS += -D_PATH_DHCLIENT_SCRIPT='"/sbin/dhclient-script"'
 CFLAGS += -D_PATH_DHCPD_CONF='"/etc/dhcp/dhcpd.conf"'
 CFLAGS += -D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
 CFLAGS += -DNOMINUM
 
+export CFLAGS
+
 patched-ldap/build-stamp:
 	dh_testdir
 

-- 
ISC DHCP packaging for Debian