[Glibc-bsd-commits] r4445 - trunk/freebsd-quota/debian

[Guillem Jover]

Author: guillem
Date: 2013-05-18 18:29:58 +0000 (Sat, 18 May 2013)
New Revision: 4445

Modified:
   trunk/freebsd-quota/debian/changelog
   trunk/freebsd-quota/debian/rules
Log:
Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS

Thus enabling hardening flags.


Modified: trunk/freebsd-quota/debian/changelog
===================================================================
--- trunk/freebsd-quota/debian/changelog	2013-05-17 19:18:38 UTC (rev 4444)
+++ trunk/freebsd-quota/debian/changelog	2013-05-18 18:29:58 UTC (rev 4445)
@@ -8,6 +8,8 @@
   * Switch from dh sequencer to a proper explicit debhelper rules file.
     dh does not cope well with setting the PATH variable.
   * Switch to debhelper compatibility level 9.
+  * Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS, thus enabling
+    hardening flags.
 
  -- Guillem Jover <guillem at debian.org>  Wed, 01 May 2013 16:42:02 +0200
 

Modified: trunk/freebsd-quota/debian/rules
===================================================================
--- trunk/freebsd-quota/debian/rules	2013-05-17 19:18:38 UTC (rev 4444)
+++ trunk/freebsd-quota/debian/rules	2013-05-18 18:29:58 UTC (rev 4445)
@@ -9,10 +9,13 @@
 ORIGDIR = $(SOURCE)-$(VERSION)
 TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
 
-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE \
+CFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -I. -D_GNU_SOURCE \
+         $(shell dpkg-buildflags --get CFLAGS) -Wall -pipe -fPIC \
          $(shell pkg-config --cflags libbsd-overlay)
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
-        NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+        NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
+        DESTDIR=$(DESTDIR) make
 
 PROGS_DEP = \
   sbin/fsck \