diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-04 21:01:44 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-04 21:01:44 +0000 |
| commit | 6cbd75a9910c1df57997e27fdba1bc80839a0187 (patch) | |
| tree | 4f7a0daabe157721ce735b7d7166653643a950f9 /sci-libs/xgks-pmel | |
| parent | Masking dev-libs/qsa for QA removal. (diff) | |
| download | gentoo-2-6cbd75a9910c1df57997e27fdba1bc80839a0187.tar.gz gentoo-2-6cbd75a9910c1df57997e27fdba1bc80839a0187.tar.bz2 gentoo-2-6cbd75a9910c1df57997e27fdba1bc80839a0187.zip | |
Add -j1 to build, see bug #295724.
(Portage version: 2.2_rc55/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/xgks-pmel')
| -rw-r--r-- | sci-libs/xgks-pmel/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild | 27 |
2 files changed, 19 insertions, 14 deletions
diff --git a/sci-libs/xgks-pmel/ChangeLog b/sci-libs/xgks-pmel/ChangeLog index b08a9e2fb1d8..fa08a657b628 100644 --- a/sci-libs/xgks-pmel/ChangeLog +++ b/sci-libs/xgks-pmel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/xgks-pmel # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/ChangeLog,v 1.3 2009/06/08 02:28:16 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/ChangeLog,v 1.4 2009/12/04 21:01:44 flameeyes Exp $ + + 04 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> + xgks-pmel-2.5.5.ebuild: + Add -j1 to build, see bug #295724. 08 Jun 2009; Steve Arnold <nerdboy@gentoo.org> xgks-pmel-2.5.5.ebuild: Renamed package binaries to avoid conflicts; closes bug #272629. diff --git a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild index b1a0e7b26d9f..df74926de9b3 100644 --- a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild +++ b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild,v 1.3 2009/06/08 02:28:16 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild,v 1.4 2009/12/04 21:01:44 flameeyes Exp $ inherit eutils fortran toolchain-funcs multilib @@ -26,20 +26,21 @@ src_unpack() { src_compile() { sed -i -e "s:lib64:$(get_libdir):g" port/master.mk.in \ - fontdb/Makefile.in || die "sed 1 failed" + fontdb/Makefile.in || die "sed 1 failed" CFLAGS=${CFLAGS} LD_X11='-L/usr/$(get_libdir) -lX11' \ - FC=${FORTRANC} CC=$(tc-getCC) OS=linux \ - ./configure --prefix=/usr --exec_prefix=/usr/bin \ - || die "configure failed" + FC=${FORTRANC} CC=$(tc-getCC) OS=linux \ + ./configure --prefix=/usr --exec_prefix=/usr/bin \ + || die "configure failed" sed -i -e "s:port/all port/install:port/all:g" Makefile \ - || die "sed 2 failed" + || die "sed 2 failed" - make || die "make failed" + # Fails parallel build, bug #295724 + emake -j1 || die "make failed" cd src/fortran - make || die "make fortran failed" + emake -j1 || die "make fortran failed" } src_install() { @@ -56,10 +57,10 @@ src_install() { dodoc COPYRIGHT HISTORY INSTALL README || die doman doc/{xgks.3,xgks_synop.3} || die if use doc; then - newdoc doc/binding/cbinding.me cbinding || die - newdoc doc/userdoc/userdoc.me userdoc || die - insinto /usr/share/doc/${P}/examples - doins progs/{hanoi.c,star.c} || die + newdoc doc/binding/cbinding.me cbinding || die + newdoc doc/userdoc/userdoc.me userdoc || die + insinto /usr/share/doc/${P}/examples + doins progs/{hanoi.c,star.c} || die fi insinto /usr/include/xgks @@ -68,7 +69,7 @@ src_install() { doins src/fortran/f*.h || die doins src/lib/w*.h || die doins src/lib/{input.h,metafile.h,polylines.h,polymarkers.h,text.h} \ - || die + || die insinto /usr/include doins src/lib/xgks.h || die |