| 1 |
commit: dccf96e68bdfb1f87b193e8429b6ec0fa8d66e34 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 23 19:20:57 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 23 19:22:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccf96e6 |
| 7 |
|
| 8 |
sys-firmware/ipxe: fix building with current stable hardened toolchains #586558 |
| 9 |
|
| 10 |
Current Gentoo stable hardened toolchains utilize "-nopie" while upstream |
| 11 |
has standardized "-no-pie". Hack the pie patch to support both until we |
| 12 |
can update our gcc patchsets to use the newer name. |
| 13 |
|
| 14 |
sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch | 4 ++-- |
| 15 |
sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch | 4 ++-- |
| 16 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index c5a5956..3156f3d 100644 |
| 20 |
--- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch |
| 21 |
+++ b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch |
| 22 |
@@ -22,8 +22,8 @@ index fe3adc9ce436..59ad25b6e0af 100644 |
| 23 |
ifeq ($(CCTYPE),gcc) |
| 24 |
-PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ] |
| 25 |
-PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie') |
| 26 |
-+PIE_TEST = [ -z "`$(CC) -fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1`" ] |
| 27 |
-+PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -no-pie') |
| 28 |
++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 |
| 29 |
++PIE_FLAGS := $(shell $(PIE_TEST)) |
| 30 |
WORKAROUND_CFLAGS += $(PIE_FLAGS) |
| 31 |
endif |
| 32 |
|
| 33 |
|
| 34 |
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 |
| 35 |
index 6abc8c6..a0501d1 100644 |
| 36 |
--- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch |
| 37 |
+++ b/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch |
| 38 |
@@ -22,8 +22,8 @@ index fe3adc9ce436..59ad25b6e0af 100644 |
| 39 |
ifeq ($(CCTYPE),gcc) |
| 40 |
-PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ] |
| 41 |
-PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie') |
| 42 |
-+PIE_TEST = [ -z "`$(CC) -fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1`" ] |
| 43 |
-+PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -no-pie') |
| 44 |
++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 |
| 45 |
++PIE_FLAGS := $(shell $(PIE_TEST)) |
| 46 |
WORKAROUND_CFLAGS += $(PIE_FLAGS) |
| 47 |
endif |
Archives