diff options
| -rw-r--r-- | dev-lang/spidermonkey/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild | 23 |
2 files changed, 26 insertions, 2 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog index 4d76cef171e0..0d570e0f0cb6 100644 --- a/dev-lang/spidermonkey/ChangeLog +++ b/dev-lang/spidermonkey/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/spidermonkey # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.73 2012/05/03 02:41:39 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.74 2012/05/07 17:51:46 anarchy Exp $ + + 07 May 2012; Jory A. Pratt <anarchy@gentoo.org> spidermonkey-1.8.5-r1.ebuild: + Fix cross compilation bug #414473 03 May 2012; Jeff Horelick <jdhore@gentoo.org> spidermonkey-1.8.2.15.ebuild, spidermonkey-1.8.2.15-r1.ebuild, spidermonkey-1.8.5-r1.ebuild: diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild index 47130eca270a..b7dd7ca7a87e 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.6 2012/05/03 02:41:39 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.7 2012/05/07 17:51:46 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -70,6 +70,27 @@ src_configure() { src_compile() { cd "${BUILDDIR}" + if tc-is-cross-compiler; then + make CFLAGS="" CXXFLAGS="" \ + CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \ + jscpucfg host_jsoplengen host_jskwgen || die + make CFLAGS="" CXXFLAGS="" \ + CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \ + -C config nsinstall || die + mv {,native-}jscpucfg + mv {,native-}host_jskwgen + mv {,native-}host_jsoplengen + mv config/{,native-}nsinstall + sed -e 's@./jscpucfg@./native-jscpucfg@' \ + -e 's@./host_jskwgen@./native-host_jskwgen@' \ + -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ + -i Makefile + sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk + rm config/host_nsinstall.o \ + config/host_pathsub.o \ + host_jskwgen.o \ + host_jsoplengen.o + fi emake || die } |