diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-06-21 00:59:39 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-06-21 00:59:52 -0400 |
| commit | 7d31cc8d1b42484b6635f8b4fe0cd8161183c337 (patch) | |
| tree | 2e93458c7c9ea08873f3826bb13e6477106b3bda | |
| parent | net-misc/dropbear: mark 2016.73 arm64/hppa/ia64/m68k/ppc/ppc64/s390/sh/sparc/... (diff) | |
| download | gentoo-7d31cc8d1b42484b6635f8b4fe0cd8161183c337.tar.gz gentoo-7d31cc8d1b42484b6635f8b4fe0cd8161183c337.tar.bz2 gentoo-7d31cc8d1b42484b6635f8b4fe0cd8161183c337.zip | |
sys-firmware/ipxe: fix building when ssp is enabled by default #585752
| -rw-r--r-- | sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch | 32 | ||||
| -rw-r--r-- | sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild | 1 |
2 files changed, 33 insertions, 0 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 new file mode 100644 index 000000000000..c5a595614f84 --- /dev/null +++ b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/585752 + +From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 21 Jun 2016 00:47:32 -0400 +Subject: [PATCH] [build] fix PIE disable flag + +The flag is "-no-pie", not "-nopie". + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + src/arch/i386/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile +index fe3adc9ce436..59ad25b6e0af 100644 +--- a/src/Makefile.housekeeping ++++ b/src/Makefile.housekeeping +@@ -75,8 +75,8 @@ CFLAGS += -Ui386 + # output on stderr instead of checking the exit status. + # + 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') + WORKAROUND_CFLAGS += $(PIE_FLAGS) + endif + +-- +2.8.2 + diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild index 2d58cf1357bc..198c86c98544 100644 --- a/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild +++ b/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild @@ -30,6 +30,7 @@ S="${WORKDIR}/ipxe-${GIT_SHORT}/src" src_prepare() { epatch "${FILESDIR}"/${P}-git-version.patch #482804 + epatch "${FILESDIR}"/${P}-no-pie.patch #585752 } src_configure() { |