[pkg-wpa-devel] r1713 - in /wpa/trunk/debian: changelog rules

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun Apr  8 21:49:59 2012
New Revision: 1713

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1713
Log:
enable hardened build flags. (Closes: #657332)

Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/rules

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1713&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Sun Apr  8 21:49:59 2012
@@ -42,8 +42,9 @@
   * fix ftbfs with gcc/g++ 4.7 (Closes: 667416)
   * unfortunately, hostapd package historically added an epoch, so an epoch
     must now be added to this source package too.
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sun, 08 Apr 2012 19:56:00 +0200
+  * enable hardened build flags. (Closes: #657332)
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 09 Apr 2012 07:48:11 +1000
 
 wpasupplicant (0.7.3-6) unstable; urgency=low
 

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1713&op=diff
==============================================================================
--- wpa/trunk/debian/rules (original)
+++ wpa/trunk/debian/rules Sun Apr  8 21:49:59 2012
@@ -1,9 +1,11 @@
 #!/usr/bin/make -f
 
-CFLAGS   = -MMD -Wall -g
+CFLAGS   = -MMD -Wall
+CFLAGS   += $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS =  $(shell dpkg-buildflags --get CXXFLAGS)
 UCFLAGS  = -MMD -Wall -g -Os
-CXXFLAGS = -g
-LDFLAGS  = -Wl,--as-needed
+LDFLAGS  =  $(shell dpkg-buildflags --get LDFLAGS),--as-needed
 BINDIR   = /sbin
 V = 0
 
@@ -15,7 +17,7 @@
 	CXXFLAGS += -O2
 endif
 
-export CFLAGS CXXFLAGS LDFLAGS BINDIR V
+export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS BINDIR V
 
 DEB_HOST_ARCH_OS              ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 HOSTAPD_DOT_CONFIG            := debian/config/hostapd/$(DEB_HOST_ARCH_OS)