[gdal] 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-2.2
in repository gdal.

commit 0a0cfc523025b838217a79761e49ea31e7bca4c8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 4 19:51:04 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 f6fa328..fc7e5ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (2.2.0+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Disable PIE on Ubuntu where it's still problematic.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 04 Jun 2017 19:50:51 +0200
+
 gdal (2.2.0+dfsg-1~exp1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 5c4c081..4c84242 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,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
+
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
 PYVERS=$(shell pyversions -v -r debian/control) $(shell py3versions -v -r)

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