The following commit has been merged in the sid branch:
commit feac1f983ce3fb45266283ba07483e029095b022
Author: Guillem Jover <[email protected]>
Date: Sun Oct 2 09:06:53 2011 +0200
dpkg-buildflags: Set preprocessor option -D_FORTIFY_SOURCE=2 in CPPFLAGS
Instead of setting it in the CFLAGS and CXXFLAGS variables.
Closes: #642521, #643632
diff --git a/debian/changelog b/debian/changelog
index 13fadd8..7ef29f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
dpkg (1.16.1.1) UNRELEASED; urgency=low
+ [ Raphaël Hertzog ]
* Fix dpkg-source to not ignore the automatic patch when checking
for unrecorded changes.
* Let dpkg-source --commit create debian/patches when required.
@@ -7,6 +8,10 @@ dpkg (1.16.1.1) UNRELEASED; urgency=low
* Update dpkg-buildflags(1) to not include quotes in the examples
setting DEB_BUILD_MAINT_OPTIONS.
+ [ Guillem Jover ]
+ * Change dpkg-buildflags to set preprocessor option -D_FORTIFY_SOURCE=2
+ in CPPFLAGS, instead of CFLAGS and CXXFLAGS. Closes: #642521, #643632
+
-- Raphaël Hertzog <[email protected]> Tue, 27 Sep 2011 08:15:51 +0200
dpkg (1.16.1) unstable; urgency=low
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index c34f4b8..7cc49d5 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -135,8 +135,7 @@ sub add_hardening_flags {
}
# Fortify
if ($use_feature{"fortify"}) {
- $flags->append("CFLAGS", "-D_FORTIFY_SOURCE=2");
- $flags->append("CXXFLAGS", "-D_FORTIFY_SOURCE=2");
+ $flags->append("CPPFLAGS", "-D_FORTIFY_SOURCE=2");
}
# Format
if ($use_feature{"format"}) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
