[Pkg-gnupg-commit] [gnupg2] 01/01: remove -pie from hppa build of gpgv-static (Closes #846889)

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit 528c3219f029aa6f39a2676de62a671d0099fe8c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Dec 5 12:28:25 2016 -0500

    remove -pie from hppa build of gpgv-static (Closes #846889)
---
 debian/rules | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 99c3015..ecd2f19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,12 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+ifeq ($(DEB_HOST_ARCH),hppa)
+	GPGV_STATIC_HARDENING = ""
+else
+	GPGV_STATIC_HARDENING = "-pie"
+endif
+
 %:
 	dh $@ --with=autoreconf --builddirectory=build
 
@@ -36,7 +42,7 @@ override_dh_auto_build-arch:
 	dh_auto_build --builddirectory=build
 	cp -a build-gpgv-udeb build-gpgv-static
 	rm -f build-gpgv-static/g10/gpgv
-	cd build-gpgv-static/g10 && $(MAKE) LDFLAGS="$$LDFLAGS -pie -static" gpgv
+	cd build-gpgv-static/g10 && $(MAKE) LDFLAGS="$$LDFLAGS $(GPGV_STATIC_HARDENING) -static" gpgv
 	mv build-gpgv-static/g10/gpgv build-gpgv-static/g10/gpgv-static
 
 override_dh_auto_build-indep:

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