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 | f6a92a3812c0a3d0bc03c66130bb538cec2f42a2 (patch) | |
| tree | 714764e3a800ac1e7c33645babe82e9bcbde1b50 /dev-lang | |
| parent | ia64 love (diff) | |
| download | historical-f6a92a3812c0a3d0bc03c66130bb538cec2f42a2.tar.gz historical-f6a92a3812c0a3d0bc03c66130bb538cec2f42a2.tar.bz2 historical-f6a92a3812c0a3d0bc03c66130bb538cec2f42a2.zip | |
src_install needs CC at least, apparently. :-(
Package-Manager: portage-2.0.53
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/spidermonkey/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild | 19 |
3 files changed, 20 insertions, 9 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/Manifest b/dev-lang/spidermonkey/Manifest index 70556f488662..be831f83d629 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -1,8 +1,8 @@ -MD5 7f2c0e3c9ec5684a5afb1cb8901eba2a ChangeLog 2216 +MD5 e1b4fc81f0535258f9384a7f84eb0116 ChangeLog 2347 MD5 e7bfb72073e1ade3470d60ba93042804 files/digest-spidermonkey-1.5_rc5 63 MD5 8e216cdd6972fcc5206162ef5f0a9702 files/digest-spidermonkey-1.5_rc6 64 MD5 8e216cdd6972fcc5206162ef5f0a9702 files/digest-spidermonkey-1.5_rc6-r1 64 MD5 28f680a9a90133efd1e29dd6945ceb90 files/spidermonkey-1.5_rc6-va_copy-fix.patch 1643 MD5 92316cef417fab365401f2ce9d8f7394 spidermonkey-1.5_rc5.ebuild 802 -MD5 9b1501c802ccc50e2d72b6098bc7c01c spidermonkey-1.5_rc6-r1.ebuild 1468 +MD5 e2b0c91661719d1621b87a9c124c7dc6 spidermonkey-1.5_rc6-r1.ebuild 1548 MD5 b0a39d97a54b44ecd77f8b5671cd7fdd spidermonkey-1.5_rc6.ebuild 1147 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 |