[Crosstoolchain-logs] [SCM] GNU GDB Debian packaging repository branch, master, updated. debian/7.6-3-25-g41eb07a

[Samuel Bronson]

The following commit has been merged in the master branch:
commit 4de7a47171b49014d710a676a8ae5ed5b7fe93c4
Author: Samuel Bronson <naesten at gmail.com>
Date:   Sat Jun 15 22:47:12 2013 -0400

    Make hardening work a bit better
    
    This works around the upstream {configure,Makefile}{.in,} dropping
    CPPFLAGS/LDFLAGS on the floor, and passes CFLAGS into the configure
    calls for gdb-multiarch and gdb-minimal.

diff --git a/debian/rules b/debian/rules
index 09fcb96..1631531 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 # This implements building using a configure script and Makefile.
 include /usr/share/cdbs/1/class/autotools.mk
 
+# The top-level configure script fails to pass these down properly ...
+export CPPFLAGS
+export LDFLAGS
+
 # Always install into debian/tmp, even if we are only building one package.
 DEB_DESTDIR := $(shell pwd)/debian/tmp
 
@@ -206,7 +210,7 @@ build64-stamp:
 build/gdb-multiarch:: build-multiarch-stamp
 build-multiarch-stamp:
 	mkdir -p $(BUILDDIRMULTIARCH)
-	cd $(BUILDDIRMULTIARCH) && \
+	cd $(BUILDDIRMULTIARCH) && CFLAGS="$(CFLAGS)" \
 	  $(shell pwd)/configure $(DEB_CONFIGURE_FLAGS_MULTIARCH)
 	cd $(BUILDDIRMULTIARCH) && $(DEB_MAKE_ENVVARS) $(MAKE) $(NJOBS)
 	touch $@
@@ -214,7 +218,7 @@ build-multiarch-stamp:
 build/gdb-minimal:: build-minimal-stamp
 build-minimal-stamp:
 	mkdir -p $(BUILDDIRMIN)
-	cd $(BUILDDIRMIN) && \
+	cd $(BUILDDIRMIN) && CFLAGS="$(CFLAGS)" \
 	  $(shell pwd)/configure $(DEB_CONFIGURE_FLAGS_MIN)
 	cd $(BUILDDIRMIN) && $(DEB_MAKE_ENVVARS) $(MAKE) $(NJOBS)
 	touch $@

-- 
GNU GDB Debian packaging repository