[grass] 01/01: Disable PIE on Ubuntu where it's still problematic.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository grass.

commit 1b6b075ecfdd703e2dad5c309860f86856190b05
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Apr 9 13:11:21 2017 +0200

    Disable PIE on Ubuntu where it's still problematic.
---
 debian/changelog | 6 ++++++
 debian/rules     | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ee5c67f..2904304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (7.2.1~rc1-1~exp2) UNRELEASED; urgency=medium
+
+  * Disable PIE on Ubuntu where it's still problematic.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 09 Apr 2017 13:11:18 +0200
+
 grass (7.2.1~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/rules b/debian/rules
index 97120f0..4eea291 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,13 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+# Disable PIE on Ubuntu where it's still problematic
+VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
+
+ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
+	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+endif
+
 VERSION=$(shell echo `head -2 $(CURDIR)/include/VERSION` | sed -e 's/ //')
 ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION` | sed -e 's/ //g' -e 's/RC/-/')
 BASE_NAME=grass$(VERSION)

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