Bug #389799: more parallel make problems.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 63 insertions, 4 deletions

diff --git a/sys-power/iasl/ChangeLog b/sys-power/iasl/ChangeLog
index 2d374d49adef..ba3f8d2bbd91 100644
--- a/sys-power/iasl/ChangeLog
+++ b/sys-power/iasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/iasl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.34 2011/11/07 03:39:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.35 2011/11/07 11:30:29 robbat2 Exp $
+
+  07 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> iasl-20110922.ebuild,
+  +files/iasl-20110922-parallelmake-003.patch:
+  Bug #389799: more parallel make problems.
 
 *iasl-20110922 (07 Nov 2011)
 
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index 362a8d29c335..90dcfae16292 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -6,6 +6,7 @@ AUX iasl-20110922-as-needed.patch 450 RMD160 781bd387653a9bb9b5bcb4ed5e0bba31dde
 AUX iasl-20110922-locale.patch 435 RMD160 8d8b7b891f6387095d4e0ec3a1f654d1195f0d3e SHA1 604a91e8f1b8a1697a65d2bfedde1acbd010a7ca SHA256 12dc10052f6929aaff8ee45b4380a2cb30a1df750e294302a30339c94dce3ef9
 AUX iasl-20110922-parallelmake-001.patch 2089 RMD160 93e9f0094232f4cf10e810cd0e3b9d3529623777 SHA1 e18e7da80feab3bc932e48e4020364d21b795d5d SHA256 8c38b9d069e3e779abed62b1efe91090c8f32f085a872950c1698911c824e65d
 AUX iasl-20110922-parallelmake-002.patch 2954 RMD160 e5c00da53e2bc5e7ccdb00bfc8dfd45e4ece2e65 SHA1 cde1a2703e57bd65da52932fad303ca565cfb6e1 SHA256 9e0ad7f1f32f27cf12a8418161cffcbd02486f9d7c3cb3f45b1d26ecbd28ed42
+AUX iasl-20110922-parallelmake-003.patch 2099 RMD160 7e54628c2421909c05da9e4397fdc6ed19276142 SHA1 d1af3efc27493fabd181d1d05c51ec2c453ef8ae SHA256 31ea6f8a397fc997b07aac62590f42861d18a02cae9c999b933dfa6fa8f6b36a
 AUX iasl-locale.patch 199 RMD160 db7cf5eebca6b43a81050c9b9a6c747efdbc4b1e SHA1 36226eba6a456714729b6faaa8ee3f1f94d575e1 SHA256 76cd2b49a00b279770b60fe0e8ba32fddd778e97518d77cf79cc2a9daecda654
 DIST acpica-unix-20060912.tar.gz 859242 RMD160 e8c10dd73912243e2b0e5b13b45342a963772c89 SHA1 77a1bbfaa0ad257e04a2aaa31b54a8ce1da5f2fa SHA256 f9a8bf089a639681f42e2a533b7004d2fdd9a4e3e3b6bbba9bd232c6a5acf773
 DIST acpica-unix-20080514.tar.gz 887758 RMD160 9824cd2643a134db37383849f1dfb1e44beecde0 SHA1 cb0ada08bc4acaaabbf23b7d1f2677bd9861073a SHA256 2b4b078e1234ea65b05db680566e9122c90dc0b754c9df087666bfbd3d70c086
@@ -35,6 +36,6 @@ EBUILD iasl-20090903.ebuild 3433 RMD160 5bc36f6bfb6824925524559753595592be14c5d0
 EBUILD iasl-20091013.ebuild 3433 RMD160 974f4531f6f4104efdc14742dc70244f295425da SHA1 a39571bea37e836c0e71845868ffbdf6ee9ef15b SHA256 ead6a747ce0039a3f5fcc9311b5c5dad79355eba27d73114805fd45392afa6fd
 EBUILD iasl-20100428.ebuild 3433 RMD160 b31017fb137414c200cfa081eb195c7da24b65d1 SHA1 316afcf91ce3de5ca16fcb0b7b8046fdfc3a163a SHA256 15932b282475afc5ea7f969f03dae5e43eda8a2b530576a2e77b4c6d076bf583
 EBUILD iasl-20100528.ebuild 3433 RMD160 8b051df52db29638c4667e03aa15ab8213a4a3a6 SHA1 dc87a8064cb404c182b3a75fba8e785fdcdc63aa SHA256 40b6481ad1d9a8431c55a7a33197917534f18de117ec1215fba58746f54cc0ff
-EBUILD iasl-20110922.ebuild 3551 RMD160 91c25816815027b346cccc1d7bacec46a4f7bbd8 SHA1 20332146293c59737d613bfa80cc20f885e7abb9 SHA256 824f0565d69e271acb8c2706309166efec44c0b4ebdea33afadabbcfb3fe4e2b
-MISC ChangeLog 5750 RMD160 91637c1032e1ff928a5b9d41c021f92e6a89ca96 SHA1 2db828e76e188360e01d623ac9779c59410e068e SHA256 bec9ab30c0439739776b8e412f0036cef6998674f803547a5a759daeb7de5b49
+EBUILD iasl-20110922.ebuild 3611 RMD160 534cbb6e1695d326e22863c39b815ba19cd12e39 SHA1 7606a6f779da1df67428697ccf3b1244eebcae09 SHA256 864eb5dc2ccd33c1919e731bbe8fa2d13860b5ef7622531a220bb35e35d3f1da
+MISC ChangeLog 5917 RMD160 0a8d9c873aab38d6e0888e61383e0918ffb5a9e5 SHA1 d68bec16eaf6f96b674e41abb05f008e2df3e84f SHA256 0fc3d6cee3e31d410cdd5d665635c3faf8209cde1049b55ed5a47dcb26603e4f
 MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
diff --git a/sys-power/iasl/files/iasl-20110922-parallelmake-003.patch b/sys-power/iasl/files/iasl-20110922-parallelmake-003.patch
new file mode 100644
index 000000000000..6eb18a810c6d
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20110922-parallelmake-003.patch
@@ -0,0 +1,53 @@
+Previous parallel make patches from user submission were not quite enough.
+
+Include this bit as well to fix up bison being invoked multiple times.
+
+X-Gentoo-Bug: 389799
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/389799
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar acpica-unix-20110922.orig/compiler/Makefile acpica-unix-20110922/compiler/Makefile
+--- acpica-unix-20110922.orig/compiler/Makefile	2011-11-07 11:14:51.200026000 +0000
++++ acpica-unix-20110922/compiler/Makefile	2011-11-07 11:20:03.490637284 +0000
+@@ -274,14 +274,18 @@
+ aslcompilerlex.c :   $(ASL_COMPILER)/aslcompiler.l
+ 	${LEX} ${LFLAGS} -PAslCompiler -o$@ $?
+ 
+-aslcompiler.y.c aslcompiler.y.h aslcompiler.y.output : $(ASL_COMPILER)/aslcompiler.y
+-	${YACC} ${YFLAGS} -pAslCompiler -oaslcompiler.y.c $?
++aslcompiler.y.c : $(ASL_COMPILER)/aslcompiler.y
++	${YACC} ${YFLAGS} -pAslCompiler -o aslcompiler.y.c $?
++aslcompiler.y.h : aslcompiler.y.c
++aslcompiler.y.output : aslcompiler.y.c
+ 
+ dtparserlex.c :      $(ASL_COMPILER)/dtparser.l
+ 	${LEX} ${LFLAGS} -PDtParser -o$@ $?
+ 
+-dtparser.y.c dtparser.y.h dtparser.y.output : $(ASL_COMPILER)/dtparser.y
+-	${YACC} ${YFLAGS} -pDtParser -odtparser.y.c $?
++dtparser.y.c : $(ASL_COMPILER)/dtparser.y
++	${YACC} ${YFLAGS} -pDtParser -o dtparser.y.c $?
++dtparser.y.h : dtparser.y.c
++dtparser.y.output : dtparser.y.c
+ 
+ # Rename headers produced by bison/yacc
+ 
+@@ -294,14 +298,14 @@
+ aslcompilerlex.o :   aslcompilerlex.c aslcompiler.y.h
+ 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
+ 
+-aslcompiler.y.o : aslcompiler.y.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
++aslcompiler.y.o : aslcompiler.y.c aslcompiler.y.h
++	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
+ 
+ dtparserlex.o :      dtparserlex.c dtparser.y.h
+ 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
+ 
+-dtparser.y.o :    dtparser.y.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
++dtparser.y.o :    dtparser.y.c dtparser.y.h
++	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
+ 
+ 
+ %.o : %.c $(HEADERS) $(ACPICA_HEADERS)
diff --git a/sys-power/iasl/iasl-20110922.ebuild b/sys-power/iasl/iasl-20110922.ebuild
index 6c74eb91ba99..d7bc7beae9c5 100644
--- a/sys-power/iasl/iasl-20110922.ebuild
+++ b/sys-power/iasl/iasl-20110922.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20110922.ebuild,v 1.1 2011/11/07 03:39:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20110922.ebuild,v 1.2 2011/11/07 11:30:29 robbat2 Exp $
 
 EAPI=4
 
@@ -41,6 +41,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-20110922-locale.patch"
 	epatch "${FILESDIR}/${PN}-20110922-parallelmake-001.patch"
 	epatch "${FILESDIR}/${PN}-20110922-parallelmake-002.patch"
+	epatch "${FILESDIR}/${PN}-20110922-parallelmake-003.patch"
 
 	find "${S}" -type f -name 'Makefile*' -print0 | \
 		xargs -0 -I '{}' \