[Pkg-amule-commits] [SCM] Git repository for pkg-amule branch, master, updated. debian/2.2.6+debian0-9-20-gecc91bc

[Sandro Tosi]

The following commit has been merged in the master branch:
commit ecc91bcfdff6703057186da2d5eff2dc8be19f61
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Dec 30 00:14:23 2011 +0100

    enable hardening flags; thanks to Moritz Muehlenhoff; Closes: #653503

diff --git a/debian/rules b/debian/rules
index dc0053e..d2ee69a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,13 +31,13 @@ objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 
 # CFLAGS
 
-CFLAGS = -Wall -g
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -Wall
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CXXFLAGS = `dpkg-buildflags --get CXXFLAGS`
+
+LDFLAGS_DEF += `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS_DEF = `dpkg-buildflags --get CPPFLAGS`
 
 ###
 
@@ -51,7 +51,7 @@ $(objdir)/config.status: configure
 
 	-mkdir $(objdir)
 	cd $(objdir) && \
-	env CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ../configure $(confflags)
+	env CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" LDFLAGS="$(LDFLAGS_DEF)" ../configure $(confflags)
 
 	touch $@
 

-- 
Git repository for pkg-amule