From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 749FA1388C3 for ; Wed, 13 Jan 2016 15:57:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05B5A21C002; Wed, 13 Jan 2016 15:57:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8ED9621C002 for ; Wed, 13 Jan 2016 15:57:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C86E33D3CF for ; Wed, 13 Jan 2016 15:57:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B69B4E61 for ; Wed, 13 Jan 2016 15:57:01 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1452700318.cc362d57ef3f050a2dbc7c0e87d4f2cb0b1dd309.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild X-VCS-Directories: dev-lang/spidermonkey/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: cc362d57ef3f050a2dbc7c0e87d4f2cb0b1dd309 X-VCS-Branch: master Date: Wed, 13 Jan 2016 15:57:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d65b9eb4-e8ea-4981-8d43-6d28affc13aa X-Archives-Hash: 8a23bf3b07d8352ebb8b0e5d29b13fdf commit: cc362d57ef3f050a2dbc7c0e87d4f2cb0b1dd309 Author: Mike Frysinger gentoo org> AuthorDate: Wed Jan 13 04:20:21 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 13 15:51:58 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc362d57 dev-lang/spidermonkey: fix cross-compiling logic dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild | 28 ++++++++++++-------- .../spidermonkey/spidermonkey-17.0.0-r4.ebuild | 28 +++++++++++--------- .../spidermonkey/spidermonkey-24.2.0-r3.ebuild | 30 +++++++++++++--------- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild index 10841b9..1905b66 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild @@ -83,26 +83,32 @@ src_configure() { $(use_enable test tests) } +cross_make() { + emake \ + CFLAGS="${BUILD_CFLAGS}" \ + CXXFLAGS="${BUILD_CXXFLAGS}" \ + AR="${BUILD_AR}" \ + CC="${BUILD_CC}" \ + CXX="${BUILD_CXX}" \ + RANLIB="${BUILD_RANLIB}" \ + "$@" +} src_compile() { cd "${BUILDDIR}" || die if tc-is-cross-compiler; then - make CFLAGS="" CXXFLAGS="" \ - CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \ - AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \ - jscpucfg host_jsoplengen host_jskwgen || die - make CFLAGS="" CXXFLAGS="" \ - CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \ - AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \ - -C config nsinstall || die + tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} + cross_make jscpucfg host_jsoplengen host_jskwgen + cross_make -C config nsinstall mv {,native-}jscpucfg || die mv {,native-}host_jskwgen || die mv {,native-}host_jsoplengen || die mv config/{,native-}nsinstall || die - sed -e 's@./jscpucfg@./native-jscpucfg@' \ + sed -i \ + -e 's@./jscpucfg@./native-jscpucfg@' \ -e 's@./host_jskwgen@./native-host_jskwgen@' \ -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ - -i Makefile || die - sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die + Makefile || die + sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die rm -f config/host_nsinstall.o \ config/host_pathsub.o \ host_jskwgen.o \ diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild index d374afb..186ae11 100644 --- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild @@ -80,26 +80,30 @@ src_configure() { $(use_enable test tests) } +cross_make() { + emake \ + CFLAGS="${BUILD_CFLAGS}" \ + CXXFLAGS="${BUILD_CXXFLAGS}" \ + AR="${BUILD_AR}" \ + CC="${BUILD_CC}" \ + CXX="${BUILD_CXX}" \ + RANLIB="${BUILD_RANLIB}" \ + "$@" +} src_compile() { cd "${BUILDDIR}" || die if tc-is-cross-compiler; then - make CFLAGS="" CXXFLAGS="" \ - CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \ - AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \ - jscpucfg host_jsoplengen host_jskwgen || die - make CFLAGS="" CXXFLAGS="" \ - CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \ - AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \ - -C config nsinstall || die - mv {,native-}jscpucfg || die + tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} + cross_make host_jsoplengen host_jskwgen + cross_make -C config nsinstall mv {,native-}host_jskwgen || die mv {,native-}host_jsoplengen || die mv config/{,native-}nsinstall || die - sed -e 's@./jscpucfg@./native-jscpucfg@' \ + sed -i \ -e 's@./host_jskwgen@./native-host_jskwgen@' \ -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ - -i Makefile || die - sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die + Makefile || die + sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die rm -f config/host_nsinstall.o \ config/host_pathsub.o \ host_jskwgen.o \ diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild index 07ca958..e891ec6 100644 --- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r3.ebuild @@ -88,30 +88,36 @@ src_configure() { $(use_enable test tests) } +cross_make() { + emake \ + CFLAGS="${BUILD_CFLAGS}" \ + CXXFLAGS="${BUILD_CXXFLAGS}" \ + AR="${BUILD_AR}" \ + CC="${BUILD_CC}" \ + CXX="${BUILD_CXX}" \ + RANLIB="${BUILD_RANLIB}" \ + "$@" +} src_compile() { cd "${BUILDDIR}" || die if tc-is-cross-compiler; then - make CFLAGS="" CXXFLAGS="" \ - CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \ - AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \ + tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} + cross_make \ MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ MOZ_PGO_OPTIMIZE_FLAGS="" \ - jscpucfg host_jsoplengen host_jskwgen || die - make CFLAGS="" CXXFLAGS="" \ - CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \ - AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \ + host_jsoplengen host_jskwgen + cross_make \ MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \ - -C config nsinstall || die - mv {,native-}jscpucfg || die + -C config nsinstall mv {,native-}host_jskwgen || die mv {,native-}host_jsoplengen || die mv config/{,native-}nsinstall || die - sed -e 's@./jscpucfg@./native-jscpucfg@' \ + sed -i \ -e 's@./host_jskwgen@./native-host_jskwgen@' \ -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ - -i Makefile || die - sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die + Makefile || die + sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die rm -f config/host_nsinstall.o \ config/host_pathsub.o \ host_jskwgen.o \