[Pkg-gnupg-commit] [gnupg2] 02/04: avoid -pie for gpgv-static on kfreebsd-amd64 and x32 as well

[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 8fb6d4728ac795da0e3defb084fdf9dbdd62bf7a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Dec 5 18:17:49 2016 -0500

    avoid -pie for gpgv-static on kfreebsd-amd64 and x32 as well
---
 debian/rules | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index ecd2f19..db787cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,12 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-ifeq ($(DEB_HOST_ARCH),hppa)
-	GPGV_STATIC_HARDENING = ""
+# avoid -pie for gpgv-static on hppa, kfreebsd-amd64, and x32
+# platforms, which cannot support it by default:
+ifeq (,$(filter $(DEB_HOST_ARCH), hppa kfreebsd-amd64 x32))
+GPGV_STATIC_HARDENING = "-pie"
 else
-	GPGV_STATIC_HARDENING = "-pie"
+GPGV_STATIC_HARDENING = ""
 endif
 
 %:

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