diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-10-24 05:18:11 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-10-24 05:18:11 +0000 |
| commit | 04bb1308e7743051ccdb7bb41b2acfbd9dedfee0 (patch) | |
| tree | eb505d5e6ef6e973d8e679306877b5724d163b00 | |
| parent | Let dobin_texmf_scripts die if the link is broken... but only for TeX Live 20... (diff) | |
| download | gentoo-2-04bb1308e7743051ccdb7bb41b2acfbd9dedfee0.tar.gz gentoo-2-04bb1308e7743051ccdb7bb41b2acfbd9dedfee0.tar.bz2 gentoo-2-04bb1308e7743051ccdb7bb41b2acfbd9dedfee0.zip | |
Support parallel make install
(Portage version: 2.1.8.3/cvs/Linux x86_64)
| -rw-r--r-- | dev-lang/yap/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/yap/files/yap-6.2.0-parallel-make.patch | 34 | ||||
| -rw-r--r-- | dev-lang/yap/yap-6.2.0-r1.ebuild | 5 |
3 files changed, 42 insertions, 3 deletions
diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog index 786c4dc84995..0ea278bfe8d5 100644 --- a/dev-lang/yap/ChangeLog +++ b/dev-lang/yap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/yap # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.43 2010/10/23 21:39:25 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.44 2010/10/24 05:18:11 keri Exp $ + + 24 Oct 2010; <keri@gentoo.org> yap-6.2.0-r1.ebuild, + +files/yap-6.2.0-parallel-make.patch: + Support parallel make install *yap-6.2.0-r1 (23 Oct 2010) diff --git a/dev-lang/yap/files/yap-6.2.0-parallel-make.patch b/dev-lang/yap/files/yap-6.2.0-parallel-make.patch new file mode 100644 index 000000000000..d7e09fb66738 --- /dev/null +++ b/dev-lang/yap/files/yap-6.2.0-parallel-make.patch @@ -0,0 +1,34 @@ +--- yap-6.orig/Makefile.in 2010-10-18 21:48:20.000000000 +1300 ++++ yap-6/Makefile.in 2010-10-24 17:51:34.000000000 +1300 +@@ -517,6 +517,7 @@ all: startup.yss + @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE)) + @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE)) + @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE)) ++ @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) + + startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES) + -rm -f startup.yss +@@ -568,7 +569,6 @@ install_unix: startup.yss libYap.a + @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@) + @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) + @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) +- @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) + @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) + #@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install) + mkdir -p $(DESTDIR)$(INCLUDEDIR) +@@ -619,6 +619,7 @@ install_win32: startup.yss + (cd packages/sgml; $(MAKE) install) + (cd packages/semweb; $(MAKE) install) + (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@) ++ @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) + @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) + @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) + @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) +@@ -632,7 +633,6 @@ install_data: + (cd packages/swi-minisat2; $(MAKE) install) + (cd LGPL ; $(MAKE) install) + (cd GPL ; $(MAKE) install) +- @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) + $(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap/ + $(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap/ + @INSTALLCLP@(cd LGPL/clp ; $(MAKE) install) diff --git a/dev-lang/yap/yap-6.2.0-r1.ebuild b/dev-lang/yap/yap-6.2.0-r1.ebuild index df9dff15db7e..0974a7bef2e5 100644 --- a/dev-lang/yap/yap-6.2.0-r1.ebuild +++ b/dev-lang/yap/yap-6.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.1 2010/10/23 21:39:25 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.2 2010/10/24 05:18:11 keri Exp $ inherit eutils flag-o-matic java-pkg-opt-2 @@ -28,6 +28,7 @@ src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-parallel-make.patch epatch "${FILESDIR}"/${P}-yapsharedir.patch epatch "${FILESDIR}"/${P}-ldflags.patch epatch "${FILESDIR}"/${P}-have-config.patch @@ -69,7 +70,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" -j1 install || die "make install failed." + emake DESTDIR="${D}" install || die "make install failed." dodoc changes*.html README |