From 336ddc51485bb6df9d9ea066ab40c47e129580ea Mon Sep 17 00:00:00 2001 From: Russ Tyndall Date: Wed, 18 Mar 2015 11:03:02 -0400 Subject: [PATCH] remove -pie hardening for because this caused load errors on Linux Mint systems Thanks to DJ on the mailing list for figuring this out --- ChangeLog | 4 ++++ db-mysql/Makefile | 2 +- uffi/Makefile | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc41781..e7c5d9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-18 Russ Tyndall + * {uffi,db-mysql}/Makefile: remove -pie build hardening for + which caused load issues for Linux Mint + 2014-02-26 Kevin Rosenberg * 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 6a52dc8..d67afe1 100644 --- 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 910750b..77203fd 100644 --- 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 -- 2.34.1