| 1 |
commit: de59178c073786477ba88719c2247a9ff3e52b18 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Feb 3 15:12:25 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 4 21:19:49 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de59178c |
| 7 |
|
| 8 |
sys-apps/memtest86: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3791 |
| 11 |
|
| 12 |
sys-apps/memtest86/files/memtest86-4.0-build.patch | 41 --------------------- |
| 13 |
.../memtest86/files/memtest86-4.3.3-build.patch | 43 ---------------------- |
| 14 |
2 files changed, 84 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/memtest86/files/memtest86-4.0-build.patch b/sys-apps/memtest86/files/memtest86-4.0-build.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 7dfd6c2..00000000 |
| 19 |
--- a/sys-apps/memtest86/files/memtest86-4.0-build.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,41 +0,0 @@ |
| 22 |
---- a/Makefile |
| 23 |
-+++ b/Makefile |
| 24 |
-@@ -8,11 +8,9 @@ |
| 25 |
- # |
| 26 |
- FDISK=/dev/fd0 |
| 27 |
- |
| 28 |
--AS=as -32 |
| 29 |
--CC=gcc |
| 30 |
-+ASFLAGS=-32 |
| 31 |
- |
| 32 |
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ |
| 33 |
-- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector |
| 34 |
-+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector $(SMP_FL) |
| 35 |
- |
| 36 |
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ |
| 37 |
- config.o linuxbios.o memsize.o error.o smp.o cpuid.o vmem.o random.o |
| 38 |
-@@ -23,7 +21,7 @@ |
| 39 |
- # symbols and then link it dynamically so I have full |
| 40 |
- # relocation information |
| 41 |
- memtest_shared: $(OBJS) memtest_shared.lds Makefile |
| 42 |
-- $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \ |
| 43 |
-+ $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \ |
| 44 |
- -o $@ $(OBJS) && \ |
| 45 |
- $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) |
| 46 |
- |
| 47 |
-@@ -50,7 +48,7 @@ |
| 48 |
- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c |
| 49 |
- |
| 50 |
- test.o: test.c |
| 51 |
-- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c |
| 52 |
-+ $(CC) -c $(CFLAGS:-fPIC=) -o $@ $< |
| 53 |
- |
| 54 |
- random.o: random.c |
| 55 |
- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c |
| 56 |
-@@ -72,3 +70,6 @@ |
| 57 |
- dos: all |
| 58 |
- cat mt86+_loader memtest.bin > memtest.exe |
| 59 |
- |
| 60 |
-+head.o: head.s |
| 61 |
-+bootsect.o: bootsect.s |
| 62 |
-+setup.o: setup.s |
| 63 |
|
| 64 |
diff --git a/sys-apps/memtest86/files/memtest86-4.3.3-build.patch b/sys-apps/memtest86/files/memtest86-4.3.3-build.patch |
| 65 |
deleted file mode 100644 |
| 66 |
index 2c5906a..00000000 |
| 67 |
--- a/sys-apps/memtest86/files/memtest86-4.3.3-build.patch |
| 68 |
+++ /dev/null |
| 69 |
@@ -1,43 +0,0 @@ |
| 70 |
-diff -uNr src.orig/Makefile src/Makefile |
| 71 |
---- src.orig/Makefile 2013-10-10 19:35:27.354179645 +0100 |
| 72 |
-+++ src/Makefile 2013-10-10 19:38:07.344184547 +0100 |
| 73 |
-@@ -8,11 +8,9 @@ |
| 74 |
- # |
| 75 |
- FDISK=/dev/fd0 |
| 76 |
- |
| 77 |
--AS=as -32 |
| 78 |
--CC=gcc |
| 79 |
-+ASFLAGS=-32 |
| 80 |
- |
| 81 |
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ |
| 82 |
-- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector |
| 83 |
-+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector $(SMP_FL) |
| 84 |
- |
| 85 |
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ |
| 86 |
- config.o memsize.o error.o smp.o cpuid.o vmem.o random.o |
| 87 |
-@@ -23,7 +21,7 @@ |
| 88 |
- # symbols and then link it dynamically so I have full |
| 89 |
- # relocation information |
| 90 |
- memtest_shared: $(OBJS) memtest_shared.lds Makefile |
| 91 |
-- $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \ |
| 92 |
-+ $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \ |
| 93 |
- -o $@ $(OBJS) && \ |
| 94 |
- $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) |
| 95 |
- |
| 96 |
-@@ -50,7 +48,7 @@ |
| 97 |
- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c |
| 98 |
- |
| 99 |
- test.o: test.c |
| 100 |
-- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c |
| 101 |
-+ $(CC) -c $(CFLAGS:-fPIC=) -o $@ $< |
| 102 |
- |
| 103 |
- random.o: random.c |
| 104 |
- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c |
| 105 |
-@@ -72,3 +70,7 @@ |
| 106 |
- dos: all |
| 107 |
- cat mt86+_loader memtest.bin > memtest.exe |
| 108 |
- |
| 109 |
-+head.o: head.s |
| 110 |
-+bootsect.o: bootsect.s |
| 111 |
-+setup.o: setup.s |
| 112 |
-+ |
Archives