[mapserver] 25/43: Fix disabling PIE.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch wheezy-backports
in repository mapserver.

commit 94990fd64cdb0ef92a61d2009229cd4ebdad5272
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 19 23:33:18 2013 +0200

    Fix disabling PIE.
---
 debian/rules | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index a2846b7..7083b36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,10 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-# Enable hardening build flags
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+# Enable hardening build flags, except:
+#  pie: causes build failure
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
-# libmapserver fails to build with -fPIE -pie
-export DEB_BUILD_HARDENING_PIE=0
 
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git