diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2013-01-26 20:30:58 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2013-01-26 20:30:58 +0000 |
| commit | a5023b37f99ca6c19729936f2efa90dd432ed715 (patch) | |
| tree | 501f33fbb436e9f813d4861e1877ea5e651c0be5 /sci-electronics | |
| parent | Version bump. Thanks to Alexey Malakhov <brezerk@gmail.com> (diff) | |
| download | gentoo-2-a5023b37f99ca6c19729936f2efa90dd432ed715.tar.gz gentoo-2-a5023b37f99ca6c19729936f2efa90dd432ed715.tar.bz2 gentoo-2-a5023b37f99ca6c19729936f2efa90dd432ed715.zip | |
Fix parallel build (bug 454068). Thanks Diego. Respect system AR
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/gtkwave/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-electronics/gtkwave/files/gtkwave-parallel-make.diff | 11 | ||||
| -rw-r--r-- | sci-electronics/gtkwave/gtkwave-3.3.42.ebuild | 15 |
3 files changed, 29 insertions, 3 deletions
diff --git a/sci-electronics/gtkwave/ChangeLog b/sci-electronics/gtkwave/ChangeLog index 987385eb1820..be92e5bd8522 100644 --- a/sci-electronics/gtkwave/ChangeLog +++ b/sci-electronics/gtkwave/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-electronics/gtkwave # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/ChangeLog,v 1.78 2013/01/21 10:23:06 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/ChangeLog,v 1.79 2013/01/26 20:30:58 tomjbe Exp $ + + 26 Jan 2013; Thomas Beierlein <tomjbe@gentoo.org> gtkwave-3.3.42.ebuild, + +files/gtkwave-parallel-make.diff: + Fix parallel build (bug 454068). Thanks Diego. Respect system AR *gtkwave-3.3.42 (21 Jan 2013) diff --git a/sci-electronics/gtkwave/files/gtkwave-parallel-make.diff b/sci-electronics/gtkwave/files/gtkwave-parallel-make.diff new file mode 100644 index 000000000000..2a58d05a3d2e --- /dev/null +++ b/sci-electronics/gtkwave/files/gtkwave-parallel-make.diff @@ -0,0 +1,11 @@ +--- contrib/vermin/Makefile.am.orig 2013-01-26 17:22:14.000000000 +0000 ++++ contrib/vermin/Makefile.am 2013-01-26 17:22:49.000000000 +0000 +@@ -30,7 +30,7 @@ + keywordhash.c: verilog_keyword.gperf + printf "$(GPERF) -o -i 1 -C -k 1-3,\044 -L C -H keyword_hash -N check_identifier -tT $(srcdir)/verilog_keyword.gperf >keywordhash.c" | sh + +-BUILT_SOURCES= definehash.c keywordhash.c tokens.h ++BUILT_SOURCES= definehash.c keywordhash.c tokens.h verilog.c tokens.h err.c parser.dlg + + shred.$(OBJEXT) : tokens.h + diff --git a/sci-electronics/gtkwave/gtkwave-3.3.42.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.42.ebuild index a65e73813839..b10d669d3ef6 100644 --- a/sci-electronics/gtkwave/gtkwave-3.3.42.ebuild +++ b/sci-electronics/gtkwave/gtkwave-3.3.42.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.3.42.ebuild,v 1.1 2013/01/21 10:23:06 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.3.42.ebuild,v 1.2 2013/01/26 20:30:58 tomjbe Exp $ EAPI="4" -inherit fdo-mime +inherit autotools eutils fdo-mime toolchain-funcs DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files" HOMEPAGE="http://gtkwave.sourceforge.net/" @@ -27,9 +27,16 @@ DEPEND="${RDEPEND} virtual/pkgconfig dev-util/gperf" +AT_M4DIR="${S}" + src_prepare(){ # do not install doc and examples by default sed -i -e 's/doc examples//' Makefile.in || die + + # fix parallel make + epatch "${FILESDIR}"/${PN}-parallel-make.diff + + eautoreconf } src_configure(){ @@ -45,6 +52,10 @@ src_configure(){ $(use_enable judy) } +src_compile() { + emake AR=$(tc-getAR) +} + src_install() { emake DESTDIR="${D}" install dodoc ANALOG_README.TXT SYSTEMVERILOG_README.TXT CHANGELOG.TXT |