diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-02-14 15:40:33 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-02-14 15:40:33 +0000 |
| commit | cd0b7e79d0cd303bf93dfb46bc16d0759a65c96d (patch) | |
| tree | aaec35d43cbca82ebe8f198a60a17ef2c85481d7 /sys-fs/xfsprogs | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-cd0b7e79d0cd303bf93dfb46bc16d0759a65c96d.tar.gz gentoo-2-cd0b7e79d0cd303bf93dfb46bc16d0759a65c96d.tar.bz2 gentoo-2-cd0b7e79d0cd303bf93dfb46bc16d0759a65c96d.zip | |
Fix installing in parallel #166729 by Connor.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'sys-fs/xfsprogs')
| -rw-r--r-- | sys-fs/xfsprogs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-2.8.18-symlinks.patch | 20 | ||||
| -rw-r--r-- | sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild | 5 |
3 files changed, 28 insertions, 3 deletions
diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog index d3202166b05a..aeebe12c0173 100644 --- a/sys-fs/xfsprogs/ChangeLog +++ b/sys-fs/xfsprogs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/xfsprogs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.62 2007/02/13 11:41:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.63 2007/02/14 15:40:33 vapier Exp $ + + 14 Feb 2007; Mike Frysinger <vapier@gentoo.org> + +files/xfsprogs-2.8.18-symlinks.patch, xfsprogs-2.8.18.ebuild: + Fix installing in parallel #166729 by Connor. *xfsprogs-2.8.18 (13 Feb 2007) diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.8.18-symlinks.patch b/sys-fs/xfsprogs/files/xfsprogs-2.8.18-symlinks.patch new file mode 100644 index 000000000000..6e163c8eb125 --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-2.8.18-symlinks.patch @@ -0,0 +1,20 @@ +Fix installing in parallel + +http://bugs.gentoo.org/166729 + +--- include/Makefile ++++ include/Makefile +@@ -37,10 +37,9 @@ + LSRCFILES += command.h input.h path.h project.h + LDIRT = xfs disk + +-default install : +- rm -f xfs disk +- $(LN_S) . xfs +- $(LN_S) . disk ++xfs disk: ++ $(LN_S) . $@ ++default install : xfs disk + + include $(BUILDRULES) + diff --git a/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild b/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild index 307c945ededc..ddd299fa9371 100644 --- a/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild,v 1.1 2007/02/13 11:41:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild,v 1.2 2007/02/14 15:40:33 vapier Exp $ -inherit toolchain-funcs +inherit eutils toolchain-funcs MY_P="${PN}_${PV}-1" DESCRIPTION="xfs filesystem utilities" @@ -21,6 +21,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-symlinks.patch #166729 # Inject our own CFLAGS / docpath sed -i \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ |