Add a patch to allow parallel make builds, reported upstream.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 39 insertions, 7 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index c6739fe74bcf..a57d0551198c 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.103 2008/09/29 00:31:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.104 2008/11/16 14:44:45 flameeyes Exp $
+
+  16 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/xfsprogs-2.10.1-parallelmake.patch, xfsprogs-2.10.1.ebuild:
+  Add a patch to allow parallel make builds, reported upstream.
 
 *xfsprogs-2.10.1 (29 Sep 2008)
 
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 2df6893c0f83..0905bc5e8004 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA1
 
 AUX xfsprogs-2.10.1-headers.patch 185 RMD160 74ac7ac38b5f5a8b2b303495d85414029a908630 SHA1 13a793d7382273918599066667672a2c75d155bd SHA256 3adf0282b07533e0bec9d4789f650ab5c700d5fb3a937a276d10021014c5011f
+AUX xfsprogs-2.10.1-parallelmake.patch 755 RMD160 cc4a37bc62b9b190982200d0aa34568bc1caaa86 SHA1 f20e87d5094e65193a264ba0cbe628505e9461c8 SHA256 0f973731856e95e645eba9ddea2978c97cab8714242ac1dffa1a569934dc07e2
 AUX xfsprogs-2.8.18-symlinks.patch 339 RMD160 8e2026b0b5c8be70dfcaba94f53ac9211ac6b1a2 SHA1 d7b9387d71556e18ebd6f65fd3a52bc323162844 SHA256 e1b168babbce2e4e18757827b6f53248408fa299ea345def0fb650b8f79f2d16
 DIST xfsprogs_2.10.1-1.tar.gz 1005228 RMD160 c68bd6eeaca88a94ee0898bef15c1d6b8d624539 SHA1 10cea2e56d202990a621a9b5b80061abab3aeb37 SHA256 2c0b17e594729b5b77d1ca90b4fa7e4a4da751324736fdb3a0c742252f929c0a
 DIST xfsprogs_2.9.7-1.tar.gz 998562 RMD160 088cafacd7bbc04727b0fa783dc4ffda5a674ecc SHA1 7cc9d12681597344978705e2c4a5bc54599e400a SHA256 87c6e1deb9e91cf8a6db62e519b403044b9359e691a3b0d43eec51b273c8973c
 DIST xfsprogs_2.9.8-1.tar.gz 1003288 RMD160 fb78d54204230cbe4706de28c081406d8475315d SHA1 149c2f8861c92fefe5a6d052a2df5696b4ea80a1 SHA256 84e8e32c9b2ead2ce6b97cc11da23f90a825c0593263508e14e0ef3ea4f61dff
-EBUILD xfsprogs-2.10.1.ebuild 1642 RMD160 f279ef23eba3c1ce8954a6417fe55f2e0e4ae8d2 SHA1 438857801750c6652e9c5c92d0e77c5024bbac66 SHA256 92f0080e1b98bfbc70954482943c859f9d46d4f6cf5568ce03c6fd0050010e84
+EBUILD xfsprogs-2.10.1.ebuild 1711 RMD160 f3308efaf5fcf8731bf514569f89fc67f8d5e0a2 SHA1 803735466f5272c3022a7910167675f89a5b40ae SHA256 adfdcdccdd7fbc7485d2fa3d543e49251ddb7125d25f6bfe7c1990b60c61bc91
 EBUILD xfsprogs-2.9.7.ebuild 1592 RMD160 15270542c57ffad773a33ceba1bc86e349c9d371 SHA1 75b80bc767713b4f82aa48bc376bdea310cb1121 SHA256 82d21f2d6a0de049958b4e0642cb494da7392726a51e5d3ada7ae6da320d92e2
 EBUILD xfsprogs-2.9.8.ebuild 1601 RMD160 063bbd6bbd81323912cb26e5827ffe7840ce335d SHA1 8a58f73e4e01c83ccbb317cc613b13e696bacbe7 SHA256 663161257751d22ae67b58deab5264b9bb4fe2448336eec0593e380b63448465
-MISC ChangeLog 16604 RMD160 1649cd698b2315aa522c090954dc651b909e0dc1 SHA1 1c64aa9e5b2c73f635ea7667440a538a5f4c0e49 SHA256 cbbc820f4a24a786d243cfb6bdee06b48d5fca5c8a61f2a9b8269cd881db9cd9
+MISC ChangeLog 16797 RMD160 bfa4fee456b2d05491f297d6737ba505da87f69d SHA1 d69fa061070692de98437ed558adef1a1b9fe992 SHA256 548a472fd8dfb594943b52c9eec968e53640d7c2ac26840fcf8ee72f5a820ade
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjgIgEACgkQ67wieSYcaxdTegCeINLmp+3YJDFIujuowioMyPok
-I9UAnj/D9ACjbAXte32dHCn8i122AERL
-=7wQn
+iEYEARECAAYFAkkgMdwACgkQAiZjviIA2XhGmwCfa+ffsu8v6vRAqYt54OojVnOC
+le8AnRRjIM5mgXZImGi+Y3td94t5CkQh
+=Qjm1
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.10.1-parallelmake.patch b/sys-fs/xfsprogs/files/xfsprogs-2.10.1-parallelmake.patch
new file mode 100644
index 000000000000..49db2123f331
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-2.10.1-parallelmake.patch
@@ -0,0 +1,26 @@
+Index: xfsprogs-2.10.1/include/buildmacros
+===================================================================
+--- xfsprogs-2.10.1.orig/include/buildmacros
++++ xfsprogs-2.10.1/include/buildmacros
+@@ -124,7 +124,7 @@ INSTALL_LINGUAS = \
+ endif
+ 
+ SUBDIRS_MAKERULE = \
+-	@for d in $(SUBDIRS) ""; do \
++	+@for d in $(SUBDIRS) ""; do \
+ 		if test -d "$$d" -a ! -z "$$d"; then \
+ 			$(ECHO) === $$d ===; \
+ 			$(MAKEF) -C $$d $@ || exit $$?; \
+@@ -139,10 +139,10 @@ MAN_MAKERULE = \
+ 	done
+ 
+ DIST_MAKERULE = \
+-	$(MAKEF) -C build dist
++	+$(MAKEF) -C build dist
+ 
+ SOURCE_MAKERULE = \
+-	@test -z "$$DIR" && DIR="."; \
++	+@test -z "$$DIR" && DIR="."; \
+ 	for f in $(SRCFILES) ""; do \
+ 	    test -z "$$f" && break; \
+ 	    test -L "$$f" || $(ECHO) $$DIR/$$f; \
diff --git a/sys-fs/xfsprogs/xfsprogs-2.10.1.ebuild b/sys-fs/xfsprogs/xfsprogs-2.10.1.ebuild
index 1d3323115bc8..13ea80299107 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.10.1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.10.1.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-fs/xfsprogs/xfsprogs-2.10.1.ebuild,v 1.1 2008/09/29 00:31:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.10.1.ebuild,v 1.2 2008/11/16 14:44:45 flameeyes Exp $
 
 inherit eutils toolchain-funcs autotools
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.10.1-headers.patch
 	epatch "${FILESDIR}"/${PN}-2.8.18-symlinks.patch #166729
+	epatch "${FILESDIR}"/${P}-parallelmake.patch # Upstream bug #797
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
 		include/builddefs.in \