commit: cc362d57ef3f050a2dbc7c0e87d4f2cb0b1dd309
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 04:20:21 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> 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 \
