dev-lang/spidermonkey: fix cross-compiling logic

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
index 10841b9b04ac33793eb282126143e29f4505758b..1905b66c2c8c62eaa2b2b1320f56b7f79fd25455 100644 (file)
--- 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 d374afb506f1d6755dbc928016515651157d5c04..186ae1185d1fcedee7144586bbd8ab098c596bc3 100644 (file)
--- 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 07ca9583bb5e18db2abeaacd53dfc02137260925..e891ec6def4669251c03aa6e0209f8466800a116 100644 (file)
--- 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 \