Use dpkg-buildflags in Debian rules file.

diff --git a/debian/changelog b/debian/changelog
index 11c2646240cdad247baa1b1658d03d66c7fad0cd..783833f76db630c43a627b4da8724b1e42707b82 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dnsmasq (2.62-1) unstable; urgency=low
 
    * New upstream.
+   * Use dpkg-buildflags. (Enables hardening).
 
  -- Simon Kelley <simon@thekelleys.org.uk>  Sat, 12 May 2012 15:25:23 +0000
 

diff --git a/debian/rules b/debian/rules
index 09ce2a08fcad14fbfd228e93927837c302e787d1..e49e8fe5bed265b63a7545e2ee6ad0578cb1c1a5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,14 +11,14 @@
 
 package=dnsmasq-base
 
-# policy manual, section 10.1
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-     CFLAGS = -g -O0 -Wall -W
-else
-     CFLAGS = -g -O2 -Wall -W
-endif
+CFLAGS = $(shell export DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS); dpkg-buildflags --get CFLAGS)
+CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS += -Wall -W
+
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
 COPTS = 
+
 TARGET = install-i18n
 
 DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)