[Git][debian-gis-team/gdal-grass][master] Disable PIE only on older Ubuntu releases.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / gdal-grass


Commits:
87355339 by Bas Couwenberg at 2018-06-29T20:52:02+02:00
Disable PIE only on older Ubuntu releases.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libgdal-grass (2.3.1-2) UNRELEASED; urgency=medium
+
+  * Disable PIE only on older Ubuntu releases.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Jun 2018 20:51:56 +0200
+
 libgdal-grass (2.3.1-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9),
                grass-dev (>= 7.4.1),
                libgdal-dev (>= 2.3.1),
                libpq-dev,
+               lsb-release,
                pkg-config
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,13 @@ 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)
+DISTRIBUTION_RELEASE       := $(shell lsb_release -cs)
 
 ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
-	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
-	export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed
+  ifneq (,$(filter $(DISTRIBUTION_RELEASE),trusty xenial artful bionic))
+    export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+  endif
+  export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed
 endif
 
 PKGNAME=$(shell grep Package: debian/control | head -1 | cut -d' ' -f2)



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/commit/87355339a31759d5727753392d34f15689ba67c9

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/commit/87355339a31759d5727753392d34f15689ba67c9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180629/f4628d61/attachment-0001.html>