Bug #236027, fix parallel make thanks to patch from flameeyes.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089 x86_64

4 files changed, 63 insertions, 5 deletions

diff --git a/sys-power/iasl/ChangeLog b/sys-power/iasl/ChangeLog
index 3cbcf1fee778..7fa0d8d7b795 100644
--- a/sys-power/iasl/ChangeLog
+++ b/sys-power/iasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/iasl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.20 2008/07/13 19:09:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.21 2008/09/09 06:01:36 robbat2 Exp $
+
+  09 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/iasl-20080701-parallelmake.patch, iasl-20080701.ebuild:
+  Bug #236027, fix parallel make thanks to patch from flameeyes.
 
 *iasl-20080701 (13 Jul 2008)
 
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index b20ad81eea56..87dde48dacab 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,5 +1,6 @@
 AUX acpica-unix-20051216-buildfixup.patch 6542 RMD160 7609304a7f74b836f662486d5d0c44644767ea1f SHA1 99f44514a7fa48c10fb8a339b9b0968f2d6d7ea3 SHA256 a6a1dc686dc3ce14fc1035953c3b708474a7e134fd2dc8b4993b2d99f1261ba0
 AUX acpica-unix-20060512-buildfixup.patch 5876 RMD160 9efd45283e2aff4558849ee5f46dcc6d2de5c572 SHA1 5cce3c7617de36457fa72901879f9914f3aabbf4 SHA256 ca1b41b22aed0e9d2ae154e95fc4761f66c40c8d493a3d7163edf75e43c46361
+AUX iasl-20080701-parallelmake.patch 1598 RMD160 9ab6a9799c501cacbd62676057eb060db96a1f98 SHA1 6a683e1c573cb5c655785aec739cec27d0ac9f9c SHA256 77cbcd37bfd9c6804166d58faba53414ac3595ef4e81811915dbbd9a655dfdba
 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
 DIST acpica-unix-20080701.tar.gz 891421 RMD160 653aa66eb48b0a505c4658333e75f81c8212415f SHA1 b48241592339fc3c3ddca7cbf599868b1b90bd00 SHA256 b1768267de4cfc52e5b347fa9f198bbcdebca2b605eeb015b051027dbb9f6e0b
@@ -7,6 +8,6 @@ DIST acpitests-unix-20080514.tar.gz 1898223 RMD160 16075cb2f69ab0ef0b8388b79186c
 DIST acpitests-unix-20080701.tar.gz 1880102 RMD160 23b7b14c6f518b14ce7786d12a55debe78b997f2 SHA1 6be97af198917a0168f89178316e8b79715a15ac SHA256 8dc21976da4d2ee8e4cff6cd6b807c5dcfbbdbe0ec0562d0d435b7563680bdb5
 EBUILD iasl-20060912.ebuild 1164 RMD160 e0f61b613639cbd3d2272809c38ebe132b4fcea0 SHA1 759656f4c2522e274fc3cbcb7e3ac696e81cdc27 SHA256 d3cd2c4929fa374280f48780035854850c53c0bf3c9509bf4ef273fa2f484f36
 EBUILD iasl-20080514.ebuild 3302 RMD160 a5d7da3fd78b77efd8db2a12eaecddb1cdf12fe3 SHA1 dbe62e5ad32bc37738c358eaf33dcbf8d39c0f77 SHA256 3802ef4977eede3bd1793b8f18bc48c86467ce5149c6035b1ee0ca3647af45fa
-EBUILD iasl-20080701.ebuild 3302 RMD160 d75e5a472095865ea2944a11fa8cf5dd4f5728c7 SHA1 25deb2a48db645a794710699671fcc321a947d7d SHA256 99304dd2e45f87d6b7e14de888024e21c3c9c13cc4f843042c1edc0045a0ee5a
-MISC ChangeLog 3429 RMD160 c30aff81c16e2363074fa66b259adf02dc506daa SHA1 fc20b7f104d105fdc85a4a95143179f3d13b4dcb SHA256 9f7a952228f6e052a70e1cc1f3f8365b0082b3317ed0df035b8c82487642a02e
+EBUILD iasl-20080701.ebuild 3395 RMD160 ea5d25a7cad0ffcc5aa3401c83110ef37a788dbe SHA1 08b11684f281414cc35766f20ab31b4c285356c3 SHA256 8428a96258c5b53f98b978987337409be1d0e441279ddef037758c0d2260d7e8
+MISC ChangeLog 3613 RMD160 c6fa8f459baff48443ce4a5500f0a80373b73665 SHA1 a74cafaee86723eda40e5e70fc11d05da1ce0792 SHA256 219f1d9cba9a65b119b709e15c83f1b4d2722ba783d425dabca39adb5419d4f7
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/sys-power/iasl/files/iasl-20080701-parallelmake.patch b/sys-power/iasl/files/iasl-20080701-parallelmake.patch
new file mode 100644
index 000000000000..ce51efedbab7
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20080701-parallelmake.patch
@@ -0,0 +1,47 @@
+Index: acpica-unix-20080701.old/compiler/Makefile
+===================================================================
+--- acpica-unix-20080701.old.orig/compiler/Makefile
++++ acpica-unix-20080701.old/compiler/Makefile
+@@ -1,7 +1,7 @@
+  
+ 
+ PROG=	iasl
+-SRCS=	aslcompilerparse.c aslcompilerlex.c aslanalyze.c aslcodegen.c \
++SRCS=	aslcompiler.y.c aslcompilerlex.c aslanalyze.c aslcodegen.c \
+ 	aslcompile.c aslerror.c aslfiles.c asllength.c \
+ 	asllisting.c aslload.c asllookup.c aslmain.c aslmap.c aslopcodes.c \
+ 	asloperands.c aslresource.c aslrestype1.c aslrestype2.c aslstartup.c \
+@@ -89,6 +89,7 @@ SRCS=	aslcompilerparse.c aslcompilerlex.
+ 	../tables/tbutils.c \
+ 	../tables/tbxface.c \
+ 	../osunixxf.c
++OBJS = $(patsubst %.c,%.o, $(SRCS))
+ 
+ NOMAN=	YES
+ CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include 
+@@ -105,17 +106,19 @@ YFLAGS+= -y -pAslCompiler
+ #CFLAGS+= -D_USE_BERKELEY_YACC
+ #.endif
+ 
+-aslmain : $(patsubst %.c,%.o, $(SRCS))
++aslmain : $(OBJS)
+ 	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) \
+ 		$(LOADLIBES) $(LDLIBS) -o iasl
+ 
++$(OBJS): aslcompiler.y.h
++
+ CLEANFILES= y.output y.tab.c y.tab.h aslcompiler.y.h \
+-	aslcompilerparse.c aslcompilerlex.c iasl
++	aslcompiler.y.c aslcompilerlex.c iasl
++
++aslcompiler.y.h: aslcompiler.y.c
+ 
+-aslcompilerparse.c: aslcompiler.y
+-	${YACC} ${YFLAGS} aslcompiler.y
+-	cp y.tab.c aslcompilerparse.c
+-	cp y.tab.h aslcompiler.y.h
++aslcompiler.y.c: aslcompiler.y
++	${YACC} ${YFLAGS} aslcompiler.y -o aslcompiler.y.c
+ 
+ aslcompilerlex.c: aslcompiler.l
+ 	${LEX} ${LFLAGS} -PAslCompiler -oaslcompilerlex.c aslcompiler.l
diff --git a/sys-power/iasl/iasl-20080701.ebuild b/sys-power/iasl/iasl-20080701.ebuild
index e09bbd1731f7..beafdaa20498 100644
--- a/sys-power/iasl/iasl-20080701.ebuild
+++ b/sys-power/iasl/iasl-20080701.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20080701.ebuild,v 1.1 2008/07/13 19:09:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20080701.ebuild,v 1.2 2008/09/09 06:01:36 robbat2 Exp $
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -35,6 +35,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/iasl-20080701-parallelmake.patch
+}
+
 src_compile() {
 	local target bin
 	append-flags -fno-strict-aliasing
@@ -48,7 +54,7 @@ src_compile() {
 			*) bin=${target#*/};;
 		esac
 
-		emake -j1 CC="$(tc-getCC)" || die "emake in ${target} failed"
+		emake CC="$(tc-getCC)" || die "emake in ${target} failed"
 		einfo "Finished compiling ${target}"
 
 		mv ${bin} "${T}" || die "mv ${bin} failed"