[Forensics-changes] [SCM] debian-forensics/libpff branch, master, updated. upstream/20120802-25-gfc4e1d4

[Pierre Chifflier]

The following commit has been merged in the master branch:
commit fc4e1d48bf698d2e70d698f5a3f29de33ba3f5e9
Author: Pierre Chifflier <pollux at debian.org>
Date:   Thu May 9 18:52:25 2013 +0200

    Get build flags from dpkg (this enables RELRO)

diff --git a/debian/changelog b/debian/changelog
index 25bcaad..8507b0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ libpff (20120802-1) unstable; urgency=low
 
   * Initial release (Closes: #575358)
 
- -- Pierre Chifflier <pollux at debian.org>  Wed, 20 Feb 2013 10:33:58 -0800
+ -- Pierre Chifflier <pollux at debian.org>  Thu, 09 May 2013 18:50:43 +0200
diff --git a/debian/rules b/debian/rules
index ed9debb..9da2519 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
 override_dh_auto_test:
 	# disable tests, they do not compile
 	# undefined reference to libpff_item_get_display_name_size
@@ -16,7 +18,7 @@ override_dh_clean:
 	dh $@  --with autotools-dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- LDFLAGS="-Wl,--as-needed"
+	dh_auto_configure -- LDFLAGS="-Wl,--as-needed $(LDFLAGS)"
 
 override_dh_strip:
 	dh_strip --dbg-package=libpff-dbg

-- 
debian-forensics/libpff