remove -pie hardening for because this caused load errors on Linux Mint

systems

Thanks to DJ <jakep@arqux.com> on the mailing list for figuring this out

diff --git a/ChangeLog b/ChangeLog
index fc417812ec318e494028f8db753fbfd9c8066e55..e7c5d9bfcb11e4550e9a03841fcd84da7c14e472 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-18 Russ Tyndall <russ@acceleration.net>
+       * {uffi,db-mysql}/Makefile: remove -pie build hardening for
+       which caused load issues for Linux Mint
+
 2014-02-26 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 6.6.0 release
        * {uffi,db-mysql}/Makefile: Add build hardening for Debian

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 6a52dc81c9b411ed300230146c0f895f17691689..d67afe1bacb61986ce02931541b0d7f777f08a18 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -38,7 +38,7 @@ ifneq ($(OS_CYGWIN),0)
 endif
 ifneq ($(OS_DPKG_BUILDFLAGS),0)
   CFLAGS:=$(CFLAGS) $(shell dpkg-buildflags --get CFLAGS)
-  LDFLAGS:=$(LDFLAGS) $(shell env DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
+  LDFLAGS:=$(LDFLAGS) $(shell env DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
 endif
 
 $(shared_lib): $(source) Makefile

diff --git a/uffi/Makefile b/uffi/Makefile
index 910750b85823cefcc458ce606328d1246dde6bae..77203fdfc723150ac9baf5a3b98a149cc14f0e27 100644 (file)
--- a/uffi/Makefile
+++ b/uffi/Makefile
@@ -25,7 +25,7 @@ dylib=$(base).dylib
 
 ifneq ($(OS_DPKG_BUILDFLAGS),0)
   CFLAGS:=$(CFLAGS) $(shell dpkg-buildflags --get CFLAGS)
-  LDFLAGS:=$(LDFLAGS) $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
+  LDFLAGS:=$(LDFLAGS) $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
 endif