[gentoo-commits] gentoo-x86 commit in dev-lang/spidermonkey: ChangeLog spidermonkey-1.8.5-r1.ebuild

["Jory Pratt (anarchy)" <anarchy@gentoo.org>]

anarchy     12/05/07 17:51:46

  Modified:             ChangeLog spidermonkey-1.8.5-r1.ebuild
  Log:
  Fix cross compilation bug #414473
  
  (Portage version: 2.1.10.57/cvs/Linux x86_64)

Revision  Changes    Path
1.74                 dev-lang/spidermonkey/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/ChangeLog?r1=1.73&r2=1.74

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	3 May 2012 02:41:39 -0000	1.73
+++ ChangeLog	7 May 2012 17:51:46 -0000	1.74
@@ -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:



1.7                  dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild?r1=1.6&r2=1.7

Index: spidermonkey-1.8.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- spidermonkey-1.8.5-r1.ebuild	3 May 2012 02:41:39 -0000	1.6
+++ spidermonkey-1.8.5-r1.ebuild	7 May 2012 17:51:46 -0000	1.7
@@ -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_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
 }