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

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089 x86_64)

3 files changed, 60 insertions, 3 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/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"