From dccf96e68bdfb1f87b193e8429b6ec0fa8d66e34 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 23 Jun 2016 15:20:57 -0400 Subject: [PATCH] sys-firmware/ipxe: fix building with current stable hardened toolchains #586558 Current Gentoo stable hardened toolchains utilize "-nopie" while upstream has standardized "-no-pie". Hack the pie patch to support both until we can update our gcc patchsets to use the newer name. --- sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch | 4 ++-- sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch index c5a595614f845..3156f3d11700e 100644 --- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch +++ b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch @@ -22,8 +22,8 @@ index fe3adc9ce436..59ad25b6e0af 100644 ifeq ($(CCTYPE),gcc) -PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ] -PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie') -+PIE_TEST = [ -z "`$(CC) -fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1`" ] -+PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -no-pie') ++PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done ++PIE_FLAGS := $(shell $(PIE_TEST)) WORKAROUND_CFLAGS += $(PIE_FLAGS) endif diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch index 6abc8c6715abf..a0501d1879047 100644 --- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch +++ b/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch @@ -22,8 +22,8 @@ index fe3adc9ce436..59ad25b6e0af 100644 ifeq ($(CCTYPE),gcc) -PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ] -PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie') -+PIE_TEST = [ -z "`$(CC) -fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1`" ] -+PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -no-pie') ++PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done ++PIE_FLAGS := $(shell $(PIE_TEST)) WORKAROUND_CFLAGS += $(PIE_FLAGS) endif