diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-06-11 04:54:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-06-11 04:54:02 +0000 |
| commit | 6a52655896758dbd9443af30d116090bd86d198f (patch) | |
| tree | a96e458c6bd55cb0e33ac40c97fadf386f10926a /sys-apps/dmapi | |
| parent | improved documentation (diff) | |
| download | gentoo-2-6a52655896758dbd9443af30d116090bd86d198f.tar.gz gentoo-2-6a52655896758dbd9443af30d116090bd86d198f.tar.bz2 gentoo-2-6a52655896758dbd9443af30d116090bd86d198f.zip | |
Fix parallel install problem #180672 by Maarten Billemont.
(Portage version: 2.1.2.9)
Diffstat (limited to 'sys-apps/dmapi')
| -rw-r--r-- | sys-apps/dmapi/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/dmapi/dmapi-2.2.8.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/dmapi/files/dmapi-2.2.8-symlinks.patch | 19 |
3 files changed, 26 insertions, 5 deletions
diff --git a/sys-apps/dmapi/ChangeLog b/sys-apps/dmapi/ChangeLog index 7a13278a6c80..d00e3d83abd7 100644 --- a/sys-apps/dmapi/ChangeLog +++ b/sys-apps/dmapi/ChangeLog @@ -1,9 +1,10 @@ # ChangeLog for sys-apps/dmapi # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.46 2007/06/04 23:30:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.47 2007/06/11 04:54:02 vapier Exp $ - 04 Jun 2007; Robin H. Johnson <robbat2@gentoo.org> dmapi-2.2.8.ebuild: - Bug #180672, fix parallel install failure. + 11 Jun 2007; Mike Frysinger <vapier@gentoo.org> + +files/dmapi-2.2.8-symlinks.patch, dmapi-2.2.8.ebuild: + Fix parallel install problem #180672 by Maarten Billemont. *dmapi-2.2.8 (31 May 2007) diff --git a/sys-apps/dmapi/dmapi-2.2.8.ebuild b/sys-apps/dmapi/dmapi-2.2.8.ebuild index 914f71557869..60878bf2f37f 100644 --- a/sys-apps/dmapi/dmapi-2.2.8.ebuild +++ b/sys-apps/dmapi/dmapi-2.2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.2.8.ebuild,v 1.2 2007/06/04 23:30:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.2.8.ebuild,v 1.3 2007/06/11 04:54:02 vapier Exp $ inherit eutils toolchain-funcs autotools @@ -20,6 +20,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${PN}-2.2.1-only-symlink-when-needed.patch + epatch "${FILESDIR}"/${PN}-2.2.8-symlinks.patch #180672 sed -i \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ include/builddefs.in \ @@ -36,7 +37,7 @@ src_compile() { } src_install() { - emake -j1 DIST_ROOT="${D}" install install-dev || die + emake DIST_ROOT="${D}" install install-dev || die prepalldocs # move shared libs to / diff --git a/sys-apps/dmapi/files/dmapi-2.2.8-symlinks.patch b/sys-apps/dmapi/files/dmapi-2.2.8-symlinks.patch new file mode 100644 index 000000000000..bf913248c144 --- /dev/null +++ b/sys-apps/dmapi/files/dmapi-2.2.8-symlinks.patch @@ -0,0 +1,19 @@ +Fix installing in parallel + +http://bugs.gentoo.org/180672 + +--- include/Makefile ++++ include/Makefile +@@ -9,9 +9,9 @@ + LSRCFILES = builddefs.in buildmacros buildrules dmapi_kern.h + LDIRT = xfs + +-default install : +- rm -f xfs +- $(LN_S) . xfs ++xfs: ++ $(LN_S) . $@ ++default install : xfs + + include $(BUILDRULES) + |