| 1 |
robbat2 10/03/31 19:49:32 |
| 2 |
|
| 3 |
Modified: memtest86-3.5-build.patch |
| 4 |
Log: |
| 5 |
Bug #312441: fix parallel make issue. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sys-apps/memtest86/files/memtest86-3.5-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/files/memtest86-3.5-build.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/files/memtest86-3.5-build.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/files/memtest86-3.5-build.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: memtest86-3.5-build.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86/files/memtest86-3.5-build.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
| 21 |
--- memtest86-3.5-build.patch 9 Oct 2009 08:21:12 -0000 1.1 |
| 22 |
+++ memtest86-3.5-build.patch 31 Mar 2010 19:49:32 -0000 1.2 |
| 23 |
@@ -1,8 +1,11 @@ |
| 24 |
make sure all the flags in question force i386 and disable SSP |
| 25 |
|
| 26 |
---- Makefile |
| 27 |
-+++ Makefile |
| 28 |
-@@ -10,6 +10,5 @@ |
| 29 |
+diff -Nuar --exclude '*.orig' memtest86-3.5.orig//Makefile memtest86-3.5//Makefile |
| 30 |
+--- memtest86-3.5.orig//Makefile 2010-03-31 19:43:35.355817421 +0000 |
| 31 |
++++ memtest86-3.5//Makefile 2010-03-31 19:47:10.922462467 +0000 |
| 32 |
+@@ -8,10 +8,9 @@ |
| 33 |
+ # |
| 34 |
+ FDISK=/dev/fd0 |
| 35 |
|
| 36 |
-AS=as -32 |
| 37 |
-CC=gcc |
| 38 |
@@ -11,13 +14,30 @@ make sure all the flags in question forc |
| 39 |
-CFLAGS= -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC $(SMP_FL) |
| 40 |
+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector $(SMP_FL) |
| 41 |
|
| 42 |
-@@ -28,3 +27,3 @@ |
| 43 |
+ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ |
| 44 |
+ config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \ |
| 45 |
+@@ -26,7 +25,7 @@ |
| 46 |
+ # symbols and then link it dynamically so I have full |
| 47 |
+ # relocation information |
| 48 |
memtest_shared: $(OBJS) memtest_shared.lds Makefile |
| 49 |
- $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \ |
| 50 |
+ $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \ |
| 51 |
-o $@ $(OBJS) && \ |
| 52 |
-@@ -55,3 +54,3 @@ |
| 53 |
+ $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) |
| 54 |
+ |
| 55 |
+@@ -53,7 +52,7 @@ |
| 56 |
+ $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c |
| 57 |
+ |
| 58 |
test.o: test.c |
| 59 |
- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c |
| 60 |
+ $(CC) -c $(CFLAGS:-fPIC=) -o $@ $< |
| 61 |
|
| 62 |
+ clean: |
| 63 |
+ rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin |
| 64 |
+@@ -72,3 +71,6 @@ |
| 65 |
+ dos: all |
| 66 |
+ cat mt86+_loader memtest.bin > memtest.exe |
| 67 |
+ |
| 68 |
++head.o: head.s |
| 69 |
++bootsect.o: bootsect.s |
| 70 |
++setup.o: setup.s |
Archives