commit: d72d224bc91e1011773e6b10023663ed11637f63 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Nov 18 18:37:18 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Thu Nov 19 07:27:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72d224b
sys-boot/yaboot: remove unused patch Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18316 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch | 38 ------------------------ 1 file changed, 38 deletions(-) diff --git a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch b/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch deleted file mode 100644 index ed1755b72b3..00000000000 --- a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch +++ /dev/null @@ -1,38 +0,0 @@ -disable ssp usage in yaboot itself - -unfortunately, since we link against external libs that themselves were built -with ssp turned on, we have to provide stubs to keep the linking from failing - ---- yaboot-1.3.13/Config.gentoo -+++ yaboot-1.3.13/Config.gentoo -@@ -0,0 +1,6 @@ -+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ -+ then echo "$(1)"; else echo "$(2)"; fi) -+ -+CFLAGS += $(call check_gcc, -fno-stack-protector) -+CFLAGS += $(call check_gcc, --nopie) -+ ---- yaboot-1.3.13/Makefile -+++ yaboot-1.3.13/Makefile -@@ -1,6 +1,7 @@ - ## Setup - - include Config -+include Config.gentoo - - VERSION = 1.3.13 - # Debug mode (spam/verbose) -@@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/ - OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \ - second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \ - second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \ -- lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o -+ lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o - - ifeq ($(USE_MD5_PASSWORDS),y) - OBJS += second/md5.o ---- yaboot-1.3.14/lib/ssp.c -+++ yaboot-1.3.14/lib/ssp.c -@@ -0,0 +1,2 @@ -+void __stack_chk_fail(void) {} -+void __stack_chk_fail_local(void) {}
