commit: 8cac92aeabcd6dfdf6cfd39138a2b382beea0db8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 18:09:26 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 15:04:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cac92ae
sys-apps/memtest86+: remove unused patches
.../files/memtest86+-1.70-gnu_hash.patch | 11 --------
.../files/memtest86+-2.01-hardcoded_cc.patch | 30 ----------------------
.../files/memtest86+-4.00-hardcoded_cc.patch | 30 ----------------------
3 files changed, 71 deletions(-)
diff --git a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
b/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
deleted file mode 100644
index 5a9e06dc06d..00000000000
--- a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp memtest86+-1.70-orig/memtest_shared.lds
memtest86+-1.70/memtest_shared.lds
---- memtest86+-1.70-orig/memtest_shared.lds 2007-01-27 13:34:16.000000000
+0100
-+++ memtest86+-1.70/memtest_shared.lds 2007-01-27 13:41:30.000000000 +0100
-@@ -18,6 +18,7 @@ SECTIONS {
- .dynsym : { *(.dynsym) }
- .dynstr : { *(.dynstr) }
- .hash : { *(.hash) }
-+ .gnu.hash : { *(.gnu.hash) }
- .dynamic : { *(.dynamic) }
-
- .rel.text : { *(.rel.text .rel.text.*) }
diff --git a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
b/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
deleted file mode 100644
index 3b07731daad..00000000000
--- a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp memtest86+-2.01-orig/Makefile memtest86+-2.01/Makefile
---- memtest86+-2.01-orig/Makefile 2008-03-11 21:04:28.000000000 +0100
-+++ memtest86+-2.01/Makefile 2008-03-11 21:05:25.000000000 +0100
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
-
--AS=as -32
--CC=gcc
--
--CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin
-ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -m32 -march=i486 -O1 -fomit-frame-pointer -fno-builtin
-ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
-
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
- config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
- memtest_shared.bin -o memtest.bin
-
- reloc.o: reloc.c
-- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+ $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
-
- test.o: test.c
-- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin
-ffreestanding test.c
-+ $(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin
-ffreestanding -fno-stack-protector -fno-pie -nopie test.c
-
- clean:
- rm -f *.o *.s *.iso memtest.bin memtest memtest_shared
memtest_shared.bin
diff --git a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
b/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
deleted file mode 100644
index f2950b64e80..00000000000
--- a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*rej' --exclude '*~'
memtest86+-4.00.orig/Makefile memtest86+-4.00/Makefile
---- memtest86+-4.00.orig/Makefile 2009-09-21 17:35:46.000000000 -0700
-+++ memtest86+-4.00/Makefile 2009-09-25 09:04:23.000000000 -0700
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
-
--AS=as -32
--CC=gcc
--
--CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin
-ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin
-ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
-
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
- config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
-@@ -47,10 +46,10 @@
- memtest_shared.bin -o memtest.bin
-
- reloc.o: reloc.c
-- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+ $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
-
- test.o: test.c
-- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin
-ffreestanding test.c
-+ $(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin
-ffreestanding -fno-stack-protector -fno-pie -nopie test.c
-
- clean:
- rm -f *.o *.s *.iso memtest.bin memtest memtest_shared
memtest_shared.bin
