[mapserver] 24/43: Disable PIE hardening feature.

[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 566f1ed8b434dabe838864ba7cf7c12a9f6eb18e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 19 23:17:38 2013 +0200

    Disable PIE hardening feature.
---
 debian/rules | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7bc8c25..a2846b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,19 @@ export DH_OPTIONS
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+# 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)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
-CFLAGS+=$(CPPFLAGS)
-CFLAGS+=$(LDFLAGS)
+#CFLAGS+=$(CPPFLAGS)
+#CFLAGS+=$(LDFLAGS)
 
 # mapscript.so for ruby1.9.1 fails to build with -Werror=format-security
 RUBY_CPPFLAGS=$(subst -Werror=format-security,,$(CFLAGS))
+RUBY_CPPFLAGS+=$(LDFLAGS)
  
 PYVERS=$(shell pyversions -r debian/control)
 RUBYVERS=1.8 1.9.1
@@ -47,7 +51,7 @@ COMMON_CONFIG=	--prefix=/usr \
 		--with-cairo
 
 MS_CFLAGS=$(CFLAGS)
-MS_CXXFLAGS=$(MS_CFLAGS)
+MS_CXXFLAGS=$(CFLAGS)
 MS_CPPFLAGS=$(CPPFLAGS)
 MS_LDFLAGS=$(LDFLAGS)
 

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