sys-fs/aufs: adding upstream patch for parallel build

svn path=/sunrise/; revision=5370

5 files changed, 57 insertions, 5 deletions

diff --git a/sys-fs/aufs/ChangeLog b/sys-fs/aufs/ChangeLog
index 5760d19bf..7f5f7791c 100644
--- a/sys-fs/aufs/ChangeLog
+++ b/sys-fs/aufs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Jan 2008; (Tommy[D]) tommy100@gmx.de +files/parallel-build.patch,
+  aufs-20071216.ebuild:
+  adding upstream patch for parallel build
+
   09 Jan 2008; (Tommy[D]) tommy100@gmx.de aufs-20071216.ebuild:
   workaround for multijob error
 
diff --git a/sys-fs/aufs/Manifest b/sys-fs/aufs/Manifest
index 99b8a0f22..20216cbcb 100644
--- a/sys-fs/aufs/Manifest
+++ b/sys-fs/aufs/Manifest
@@ -1,8 +1,9 @@
 AUX aufs-20070402-ksize.patch 215 RMD160 aface602421301ed1e226194e9f8457f4a9dffd5 SHA1 d39db4cb4472b3dce1072d96c4f3198939b26bbe SHA256 0b50c428e0a23d825320c4b7960e3e8ead11fdb274ab92e927e0a86663f0a7a2
 AUX aufs-20070402-lhash.patch 1707 RMD160 17589fed81c0602db71e8937279200658e3bbc66 SHA1 f9e3d5eb25df9bf0ace036deaf0c1c75be9f514a SHA256 6a963eb4e5fa08357b6ff3d6c02ed0a04c7b5abffdb1c9d9f0435ed988821965
+AUX parallel-build.patch 1178 RMD160 af27d36f051fcc84a7fd22ead55dcaf2fa00c9bf SHA1 4a33e5af9745b5f8b4cb5d3e95a3aa3b687226b0 SHA256 3867e6430f04c7f9017e8665b2a97fd3363550e7bb5efb74f110bcb3a6ecca9f
 DIST aufs-20070402.tar.bz2 120097 RMD160 13f3a1cc7a581b1b96255262af01d90c3f601a22 SHA1 496b01279214d0a5836498ea233176e3424a3280 SHA256 c11e7c5835196873a60ac3ccae147ba4941239a0bee23beec8747bc95997eb62
 DIST aufs-20071216.tar.bz2 187971 RMD160 34dc0fffe3d954ea9eb5de9d014eeb172852d3ec SHA1 67aa11ab164e9523fe71351a7b854114c6704fed SHA256 69b5213fc56dedf7cddee8846bee3ddd8b08ddd316777f7c48d17ade2b31804d
-EBUILD aufs-20070402.ebuild 4164 RMD160 363ba107e92d07a02bf76a412c64d5846231c1bb SHA1 923e37e45f6f9182bb615d96d42734b0f496e5b5 SHA256 0c9869ef548e954824d80ec1c790c3c0448d2b7df2cc507ac02fe19898f8fac1
-EBUILD aufs-20071216.ebuild 2098 RMD160 d66c8229627697678fb4bd48e8fe314412fd23b9 SHA1 8beacf60e0fc9d6ada990f82b38da95a937a5677 SHA256 a3ab34150602acbcbede83e1d8190ff36b3f07364b31353306f2f5af1e609126
-MISC ChangeLog 2430 RMD160 4e3f1277bce6c0520fccb60e7b18d70b6053f236 SHA1 e0faf260864cde96dbdffa28b00963e77df78f4d SHA256 d47e20804ae5e88bef7c7d1bb9aca8302098c48c65688b9be19b05c5c5354118
+EBUILD aufs-20070402.ebuild 4164 RMD160 0a206413b832bf09a117376abd48b7c463ef7011 SHA1 34d1891a98809fbb85dfa2964f209dff769c3d0f SHA256 188bfd0d3be8d118c35354a89a5a171c80bd0f0ed72a32acd5526d712294b113
+EBUILD aufs-20071216.ebuild 2099 RMD160 5b9dc0a3a6a84ce98aa0b6860d8b769b818e9ed9 SHA1 8460bcc5f55970ee8da6b84e0822e1b34a8b2668 SHA256 c741b09ce2514dbe0e69a875be794636c7f4fcb99d0bc4a5a3216acb404e786d
+MISC ChangeLog 2569 RMD160 f545e13bfcfb5b73f275ebc64d92a13ab7c7008f SHA1 eae4e9a9a46c3e50b8e86327921c1c80c376f69f SHA256 075af8436d04f00ed177d86bae7093ac0e8268ac4a9b2f7454bf0391898dd14c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sys-fs/aufs/aufs-20070402.ebuild b/sys-fs/aufs/aufs-20070402.ebuild
index 29de8dccf..75b611b68 100644
--- a/sys-fs/aufs/aufs-20070402.ebuild
+++ b/sys-fs/aufs/aufs-20070402.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/sys-fs/aufs/aufs-20071216.ebuild b/sys-fs/aufs/aufs-20071216.ebuild
index 35dcaa7c8..3146e7b0c 100644
--- a/sys-fs/aufs/aufs-20071216.ebuild
+++ b/sys-fs/aufs/aufs-20071216.ebuild
@@ -33,6 +33,7 @@ pkg_setup() {
 src_unpack(){
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/parallel-build.patch
 
 	# Enable hinotify in priv_def.mk
 	if use hinotify && kernel_is ge 2 6 18 ; then
@@ -60,7 +61,7 @@ src_unpack(){
 src_compile() {
 	use x86 && ARCH=i386
 	use amd64 && ARCH=x86_64
-	emake -j1 #aufs does not compile with 3 or more
+	emake
 }
 
 src_install() {
diff --git a/sys-fs/aufs/files/parallel-build.patch b/sys-fs/aufs/files/parallel-build.patch
new file mode 100644
index 000000000..864e535c5
--- /dev/null
+++ b/sys-fs/aufs/files/parallel-build.patch
@@ -0,0 +1,46 @@
+--- local.mk	2007-12-10 10:18:33.000000000 +0900
++++ local.mk	2008-01-09 12:18:32.000000000 +0900
+@@ -73,7 +73,8 @@ export
+ # fake top level make
+ 
+ KDIR = /lib/modules/$(shell uname -r)/build
+-Tgt = aufs.ko aufs.5 aufind.sh mount.aufs auplink aulchown umount.aufs
++TgtUtil = aufs.5 aufind.sh mount.aufs auplink aulchown umount.aufs
++Tgt = aufs.ko ${TgtUtil}
+ 
+ # the environment variables are not inherited since 2.6.23
+ MAKE += CONFIG_AUFS=${CONFIG_AUFS} \
+@@ -104,27 +105,15 @@ kconfig: fs/aufs/Kconfig
+ 
+ ########################################
+ 
+-clean: ${AufsVars}
++clean:
+ 	${MAKE} -C ${KDIR} M=${CURDIR}/fs/aufs $@
+ 	${MAKE} -C util $@
+-	${RM} ${Tgt} ${AufsVars}
++	${RM} ${Tgt}
+ 	find . -type f \( -name '*~' -o -name '.#*[0-9]' \) | xargs -r ${RM}
+ 
+-util/aufs.5: FORCE
+-util/%:
+-	${MAKE} -j1 -C util
+-aufind.sh: util/aufind.sh
+-	ln -s $< $@
+-aufs.5: util/aufs.5
+-	-ln -s $< $@
+-mount.aufs: util/mount.aufs
+-	test -x $< || chmod a+x $<
+-	ln -s $< $@
+-auplink: util/auplink
+-	-ln -s $< $@
+-aulchown: util/aulchown
+-	-ln -s $< $@
+-umount.aufs: util/umount.aufs
+-	-ln -s $< $@
++build_util:
++	${MAKE} -C util
++${TgtUtil}: build_util
++	ln -s util/$@ $@
+ 
+ -include priv.mk