diff options
| author |   Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2017-02-03 16:12:25 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-02-04 22:19:49 +0100 |
| commit | de59178c073786477ba88719c2247a9ff3e52b18 (patch) | |
| tree | 429c00e5f62d45040bd82b8f7221fc67bfae0260 /sys-apps/memtest86/files | |
| parent | sys-apps/man-pages-posix: remove unused patch (diff) | |
| download | gentoo-de59178c073786477ba88719c2247a9ff3e52b18.tar.gz gentoo-de59178c073786477ba88719c2247a9ff3e52b18.tar.bz2 gentoo-de59178c073786477ba88719c2247a9ff3e52b18.zip | |
sys-apps/memtest86: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3791
Diffstat (limited to 'sys-apps/memtest86/files')
| -rw-r--r-- | sys-apps/memtest86/files/memtest86-4.0-build.patch | 41 | ||||
| -rw-r--r-- | sys-apps/memtest86/files/memtest86-4.3.3-build.patch | 43 |
2 files changed, 0 insertions, 84 deletions
diff --git a/sys-apps/memtest86/files/memtest86-4.0-build.patch b/sys-apps/memtest86/files/memtest86-4.0-build.patch deleted file mode 100644 index 7dfd6c2f6aae..000000000000 --- a/sys-apps/memtest86/files/memtest86-4.0-build.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -8,11 +8,9 @@ - # - FDISK=/dev/fd0 - --AS=as -32 --CC=gcc -+ASFLAGS=-32 - --CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ -- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector $(SMP_FL) - - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ - config.o linuxbios.o memsize.o error.o smp.o cpuid.o vmem.o random.o -@@ -23,7 +21,7 @@ - # symbols and then link it dynamically so I have full - # relocation information - memtest_shared: $(OBJS) memtest_shared.lds Makefile -- $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \ -+ $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \ - -o $@ $(OBJS) && \ - $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) - -@@ -50,7 +48,7 @@ - $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c - - test.o: test.c -- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c -+ $(CC) -c $(CFLAGS:-fPIC=) -o $@ $< - - random.o: random.c - $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c -@@ -72,3 +70,6 @@ - dos: all - cat mt86+_loader memtest.bin > memtest.exe - -+head.o: head.s -+bootsect.o: bootsect.s -+setup.o: setup.s diff --git a/sys-apps/memtest86/files/memtest86-4.3.3-build.patch b/sys-apps/memtest86/files/memtest86-4.3.3-build.patch deleted file mode 100644 index 2c5906ad5cad..000000000000 --- a/sys-apps/memtest86/files/memtest86-4.3.3-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -uNr src.orig/Makefile src/Makefile ---- src.orig/Makefile 2013-10-10 19:35:27.354179645 +0100 -+++ src/Makefile 2013-10-10 19:38:07.344184547 +0100 -@@ -8,11 +8,9 @@ - #
- FDISK=/dev/fd0
-
--AS=as -32
--CC=gcc
-+ASFLAGS=-32
-
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector $(SMP_FL)
-
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
- config.o memsize.o error.o smp.o cpuid.o vmem.o random.o
-@@ -23,7 +21,7 @@ - # symbols and then link it dynamically so I have full
- # relocation information
- memtest_shared: $(OBJS) memtest_shared.lds Makefile
-- $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
-+ $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \
- -o $@ $(OBJS) && \
- $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
-
-@@ -50,7 +48,7 @@ - $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-
- test.o: test.c
-- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+ $(CC) -c $(CFLAGS:-fPIC=) -o $@ $<
-
- random.o: random.c
- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-@@ -72,3 +70,7 @@ - dos: all
- cat mt86+_loader memtest.bin > memtest.exe
-
-+head.o: head.s
-+bootsect.o: bootsect.s
-+setup.o: setup.s
-+
|