Bug #312441: fix parallel make issue.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 38 insertions, 22 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 9c6afdba4628..45323a1a095c 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.36 2009/10/09 08:21:12 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.37 2010/03/31 19:49:32 robbat2 Exp $
+
+  31 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> memtest86-3.5.ebuild,
+  files/memtest86-3.5-build.patch:
+  Bug #312441: fix parallel make issue.
 
 *memtest86-3.5 (09 Oct 2009)
 
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index af1422babc06..9f30def1912d 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX memtest86-3.2-solar.patch 821 RMD160 ce955d5b0414e1f58758435e99d40a296893c280 SHA1 e16ef80795e76d28356cf33f10527a96d15d88fc SHA256 8004f3066fd4e332ccc9c217b6f62799fa15ec101fde9448f4aab1a2a2589019
 AUX memtest86-3.3-funky-test.patch 374 RMD160 43c5e8a66fc17ee2d8876d2a712ad113d2fed70a SHA1 c26df3e1c5e2f0ec3f143eb8b05c9555ac18a337 SHA256 9a8ecba4392eb80cf460acd51e51bc9de643730c82ba31a18801d686b3c58ebc
 AUX memtest86-3.3-gnu-hash.patch 297 RMD160 b11789b6e1882da3b29f661843e819f76aee7167 SHA1 abc9a71fc613788662f98d5ad9efaccf831903e2 SHA256 9e7d99895087369b7492ebb03ad7a3e366215444f0d32155fa4dfb02464e1c05
 AUX memtest86-3.4-build.patch 968 RMD160 59653c59b23d946191afb96cd831bc963fa4766b SHA1 918cda50a7433cadd95584ef54619bd0a2cf09eb SHA256 b222dfcbde08451974a95515bdd84762e4ec93e8226cfe42b019cf7d1e9db7eb
-AUX memtest86-3.5-build.patch 788 RMD160 51b74d5bd5cd39d7763e3dc4dd4ef8b2ef957b78 SHA1 a26b2d23d5c2688d1e3c8f4a852434504b3a6d0e SHA256 9b4a67b11466d99d33ca7df9e949643c09aa09d39adf97f655bd282699a3a56b
+AUX memtest86-3.5-build.patch 1561 RMD160 3b94c0835cd6c77f3eb1905fb03c1d44c47d9c6c SHA1 5aad3debcc251f8d8a21f92cbeb3e6b8713a5dc8 SHA256 5f37dcbe9a906085b80d4c4cfd8ca3fb0b4d6342a156ac1a529b0cc10a5058da
 DIST memtest86-3.3.tar.gz 137922 RMD160 dd390793b9e2601ceccc01671dc9aaf602a8590f SHA1 e4ae8c12e44a7f4bf7567e1601cff6b811819ee7 SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c
 DIST memtest86-3.4.tar.gz 201204 RMD160 8a4e2bddfd75e7d07a0448dc8b94dd29e67800d5 SHA1 3af9e20888401e9d0eb3eab4e793a48f0520c436 SHA256 5dd0f964c0edf887ecf462526f2f8dd1c2cccbd723390759b98e142a2394c134
 DIST memtest86-3.5.tar.gz 178560 RMD160 0df53a61316c03a1dbec3d61e268c06d56619387 SHA1 9de8742454b8e699428df986cae600d28c1d7c9a SHA256 c55875766ed2515dbde09e3648676f83cb8a3efbc3c8001f989f937a4d24e3e4
 EBUILD memtest86-3.3.ebuild 1386 RMD160 6f9e3c91380ad7c79614ae8a2b157ddab67f1124 SHA1 7b4a1ff5d1c07caa140988ab85c2361ddc0c13bb SHA256 f5cdd0271445f275e08ace9cc7d1f7718ae5ac88a6c41c01442ffc9f9b2e266a
 EBUILD memtest86-3.4.ebuild 1367 RMD160 0d7ec244f04b32412ebe4ea54aefe27707dad52f SHA1 08009166afe603226ab56f9390c9b11c03a59303 SHA256 43bfca59267fda97cba428c73a7aac57bbf0a39352ec0cfc2330cfed00e5452b
-EBUILD memtest86-3.5.ebuild 1329 RMD160 f27d5d24df0008e50afbb6820aadc7e0590058cd SHA1 008fc6fac50d028cbd68c70e752f0babad161c35 SHA256 09d2afc5b15b0f69518805c762a97169353d47645aa007f632c0e144a54289e3
-MISC ChangeLog 5465 RMD160 10bbd8aacd1c2922fd9ef7303d20e42cddcde5ec SHA1 5e657d4b578285b753d0ae761c160c9a886eeded SHA256 e04b71646043a1bafef7dc10cd63e4dcf36fb5db576b3a2d128a8bcc622a2e43
+EBUILD memtest86-3.5.ebuild 1333 RMD160 96cfdedef7be26479fed682f24034316f4aceeb7 SHA1 bed4e17cd420a230b039aace95c81f0408324ce5 SHA256 8e26e4c5f77c15dffa1e7af6abf9520613c817b6f98ce79e287c70a839b10630
+MISC ChangeLog 5617 RMD160 9f2cb502cec236d92771055a43d616d6a7ae4c94 SHA1 5c14a5e45423f8bd329aaa66dbc44bc991430ca9 SHA256 0c50ec797e94649d5b50eb7c1100d36df7254fe40ce9e72ad43d2209b793a85c
 MISC metadata.xml 241 RMD160 86f0a529b00ddd6915b76083c4f1e2db8598fae1 SHA1 70234d532f1b867dfc34bd936fb34a7015fa90ed SHA256 bd2bd1cf924d8626e469ed4c8780d7a11c8b629ce102d654b3ca0022a7f4254e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrO8n0ACgkQlPl3HsVfCDpLVACffpuxEGkJgeRpLEmoLjjSn++B
-uvoAnicDaeeDpAh4g4/7lA9/N17CKo3c
-=XsRN
------END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86/files/memtest86-3.5-build.patch b/sys-apps/memtest86/files/memtest86-3.5-build.patch
index ada8f4e909ac..6c47cddb180d 100644
--- a/sys-apps/memtest86/files/memtest86-3.5-build.patch
+++ b/sys-apps/memtest86/files/memtest86-3.5-build.patch
@@ -1,8 +1,11 @@
 make sure all the flags in question force i386 and disable SSP
 
---- Makefile
-+++ Makefile
-@@ -10,6 +10,5 @@
+diff -Nuar --exclude '*.orig' memtest86-3.5.orig//Makefile memtest86-3.5//Makefile
+--- memtest86-3.5.orig//Makefile	2010-03-31 19:43:35.355817421 +0000
++++ memtest86-3.5//Makefile	2010-03-31 19:47:10.922462467 +0000
+@@ -8,10 +8,9 @@
+ #
+ FDISK=/dev/fd0
  
 -AS=as -32
 -CC=gcc
@@ -11,13 +14,30 @@ make sure all the flags in question force i386 and disable SSP
 -CFLAGS= -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC $(SMP_FL)
 +CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector $(SMP_FL)
  
-@@ -28,3 +27,3 @@
+ 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 \
+@@ -26,7 +25,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) && \
-@@ -55,3 +54,3 @@
+ 	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
+ 
+@@ -53,7 +52,7 @@
+ 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
+ 
  test.o: test.c
 -	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
 +	$(CC) -c $(CFLAGS:-fPIC=) -o $@ $<
  
+ clean:
+ 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
+@@ -72,3 +71,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/memtest86-3.5.ebuild b/sys-apps/memtest86/memtest86-3.5.ebuild
index 0890313e8446..1b3164715199 100644
--- a/sys-apps/memtest86/memtest86-3.5.ebuild
+++ b/sys-apps/memtest86/memtest86-3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.5.ebuild,v 1.1 2009/10/09 08:21:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.5.ebuild,v 1.2 2010/03/31 19:49:32 robbat2 Exp $
 
 inherit mount-boot eutils toolchain-funcs
 
@@ -28,6 +28,8 @@ src_unpack() {
 	fi
 
 	tc-export AS CC LD
+
+	
 }
 
 src_install() {