summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-16 14:44:45 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-16 14:44:45 +0000
commit5816210271da9acc45cfbb22e151bbc02f1d8bf7 (patch)
treefda349ddb68cc24e1d185f10bbda48c1d4d199bb /sys-fs
parentVersion bump, bug #226989, thank Krzysztof Olędzki for report. Finally remov... (diff)
downloadgentoo-2-5816210271da9acc45cfbb22e151bbc02f1d8bf7.tar.gz
gentoo-2-5816210271da9acc45cfbb22e151bbc02f1d8bf7.tar.bz2
gentoo-2-5816210271da9acc45cfbb22e151bbc02f1d8bf7.zip
Add a patch to allow parallel make builds, reported upstream.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/xfsprogs/ChangeLog6
-rw-r--r--sys-fs/xfsprogs/files/xfsprogs-2.10.1-parallelmake.patch26
-rw-r--r--sys-fs/xfsprogs/xfsprogs-2.10.1.ebuild3
3 files changed, 33 insertions, 2 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/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 \