summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2005-12-02 20:34:12 +0000
committerJeroen Roovers <jer@gentoo.org>2005-12-02 20:34:12 +0000
commit50464499a770a2ac4eaba8188009926ff3398abe (patch)
tree308d1683a798eff21ed3a359d1826d3c088ea2e8 /dev-lang
parentRemoving redundant use.mask entries (it has them from parent). (diff)
downloadhistorical-50464499a770a2ac4eaba8188009926ff3398abe.tar.gz
historical-50464499a770a2ac4eaba8188009926ff3398abe.tar.bz2
historical-50464499a770a2ac4eaba8188009926ff3398abe.zip
Added AR from toolchain-funs as well for the fun of it. Slight cleanup.
Package-Manager: portage-2.0.53
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/spidermonkey/ChangeLog6
-rw-r--r--dev-lang/spidermonkey/Manifest4
-rw-r--r--dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild16
3 files changed, 19 insertions, 7 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 463a62c15c84..c82b2256c0d6 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.11 2005/12/02 18:33:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.12 2005/12/02 20:34:12 jer Exp $
+
+ 02 Dec 2005; Jeroen Roovers <jer@gentoo.org>
+ spidermonkey-1.5_rc6-r1.ebuild:
+ Added AR from toolchain-funs as well for the fun of it. Slight cleanup.
02 Dec 2005; Jeroen Roovers <jer@gentoo.org>
files/spidermonkey-1.5_rc6-va_copy-fix.patch,
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index ad69188801e0..f8dddbc8f391 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,8 +1,8 @@
-MD5 cf450138f8ee1fd1a507d6957593a689 ChangeLog 1800
+MD5 76796ba9b066125f56209917e9766a44 ChangeLog 1956
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 0d34205067a3f52da2e017b87884da4f spidermonkey-1.5_rc6-r1.ebuild 1319
+MD5 9f769e884229622a8885adbb53404edc spidermonkey-1.5_rc6-r1.ebuild 1412
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 b316010685da..289ba877c698 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.7 2005/12/02 18:33:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.8 2005/12/02 20:34:12 jer Exp $
inherit eutils toolchain-funcs
@@ -34,10 +34,18 @@ install-headers: $(HFILES)
install -g root -o root -m 444 $^ $(DESTDIR)/usr/include/js
EOF
- export CC="$(tc-getCC)"
- export LD="$(tc-getLD)"
+ do_my_compile() {
+ emake -j1 \
+ -f Makefile.ref \
+ BUILD_OPT=1 \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ AR="$(tc-getAR)" \
+ BUILD_OPT=1
+ }
+
# it needs to run twice
- emake -j1 -f Makefile.ref BUILD_OPT=1 || die
+ do_my_compile || do_my_compile || die
}
src_install() {