diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2005-12-02 23:19:03 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2005-12-02 23:19:03 +0000 |
| commit | c8d59ba5727b1a9237bb309e63dc493886468918 (patch) | |
| tree | 57c33fccdd530a31d2cce317a912279e8f9998c9 /dev-lang/spidermonkey | |
| parent | ia64 love (diff) | |
| download | gentoo-2-c8d59ba5727b1a9237bb309e63dc493886468918.tar.gz gentoo-2-c8d59ba5727b1a9237bb309e63dc493886468918.tar.bz2 gentoo-2-c8d59ba5727b1a9237bb309e63dc493886468918.zip | |
src_install needs CC at least, apparently. :-(
(Portage version: 2.0.53)
Diffstat (limited to 'dev-lang/spidermonkey')
| -rw-r--r-- | dev-lang/spidermonkey/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild | 19 |
2 files changed, 18 insertions, 7 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog index e4bb7b387ed7..cc90ddfe790f 100644 --- a/dev-lang/spidermonkey/ChangeLog +++ b/dev-lang/spidermonkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/spidermonkey # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.14 2005/12/02 22:21:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.15 2005/12/02 23:19:03 jer Exp $ + + 02 Dec 2005; Jeroen Roovers <jer@gentoo.org> + spidermonkey-1.5_rc6-r1.ebuild: + src_install needs CC at least, apparently. :-( 02 Dec 2005; Jeroen Roovers <jer@gentoo.org> spidermonkey-1.5_rc6-r1.ebuild: diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild index a8fc18b52372..7c99ae46306a 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.10 2005/12/02 22:21:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.11 2005/12/02 23:19:03 jer Exp $ inherit eutils toolchain-funcs @@ -33,9 +33,11 @@ install-headers: $(HFILES) install -g root -o root -m 555 -d $(DESTDIR)/usr/include/js install -g root -o root -m 444 $^ $(DESTDIR)/usr/include/js EOF - local MY_CC="$(tc-getCC)" - local MY_LD="$(tc-getLD)" - local MY_AR="$(tc-getAR)" + + export MY_CC="$(tc-getCC)" + export MY_LD="$(tc-getLD)" + export MY_AR="$(tc-getAR)" + do_my_compile() { emake -j1 \ -f Makefile.ref \ @@ -43,10 +45,11 @@ EOF CC="${MY_CC}" \ LD="${MY_LD}" \ AR="${MY_AR}" + return $? } # it needs to run twice - do_my_compile || do_my_compile || die + { do_my_compile || do_my_compile ;} || die } src_install() { @@ -56,7 +59,11 @@ src_install() { dobin js jscpucfg || die "dobin failed" cd - - make -f Makefile.ref DESTDIR=${D} install-headers \ + make -f Makefile.ref \ + DESTDIR=${D} install-headers \ + CC="${MY_CC}" \ + LD="${MY_LD}" \ + AR="${MY_AR}" \ || die "make install-headers failed." dodoc ../README |