[ros-image-common] 01/02: debian/rules: disable -pie from the hardening buildflags

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository ros-image-common.

commit 6c8436e83cf2f80aeb07e0880fe2e735822c887b
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Mar 20 16:10:20 2016 +0000

    debian/rules: disable -pie from the hardening buildflags
    
    This fixes a FTBFS in several architectures.
    This problem arose only now as there were a latent bug trigger by the removal
    of the inclusion of the /usr/share/dpkg/default.mk *before* defining
    DEB_BUILD_MAINT_OPTIONS.  This caused the export of the buildflags without
    the requested hardening buildflags (which were specified later).
    
    Once the inclusion of /usr/share/dpkg/default.mk is gone the export of the
    build flags is on the shoulder of dh(1) and dh_auto_configure(1) (they don't
    export them if they are already defined), which respects DEB_BUILD_MAINT_OPTIONS.
    
    Thanks: Gianfranco Costamagna <locutusofborg at debian.org> for the debug
    Closes: #818715
    Gbp-Dch: short
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 4c6f898..ed65665 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all,+bindnow,+pie
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 
 %:
 	dh $@ --parallel --with=python2 --buildsystem=cmake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-image-common.git