summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-01-19 23:20:45 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-01-19 23:20:45 +0100
commite537945222090f00f2811b0fa1a0a3a5b3d7d3f8 (patch)
treeaa9c560c6d74ed33887d42fc2d0a30b6323211a3
parente49c90b355547db33bb01229e10ca99a19652003 (diff)
* debian/rules:
- apply patch to enable usage of hardning CPPFLAGS and LDFLAGS by Moritz Muehlenhoff, thanks! (Closes: #653504)
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/rules4
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index eb49bd84e..4926bbdc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,11 @@ apt (0.8.16~exp12) experimental; urgency=low
* debian/control:
- remove APT from the short descriptions as lintian doesn't like it
and it doesn't transport any information for a reader anyway
+ * debian/rules:
+ - apply patch to enable usage of hardning CPPFLAGS and LDFLAGS by
+ Moritz Muehlenhoff, thanks! (Closes: #653504)
- -- David Kalnischkies <kalnischkies@gmail.com> Thu, 19 Jan 2012 23:14:28 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com> Thu, 19 Jan 2012 23:18:12 +0100
apt (0.8.16~exp11) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 4ef5bb47a..9eda3a8fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,8 @@ endif
ifneq (,$(shell which dpkg-buildflags))
export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
+ export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+ export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
else
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
export CXXFLAGS = -O0 -g -Wall
@@ -92,7 +94,7 @@ build/configure-stamp: configure
dh_testdir
-mkdir build
cp COPYING debian/copyright
- cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags)
+ cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags)
touch $@
build/build-stamp: build/configure-stamp