--- trunk/extras/spidermonkey/spidermonkey-52.8.0-r1.smage2	2018/05/14 12:43:59	30883
+++ trunk/extras/spidermonkey/spidermonkey-52.8.0-r1.smage2	2018/05/14 13:19:00	30884
@@ -18,7 +18,7 @@
 SRCFILE="firefox-${PVER}esr.source.tar.xz"
 SRCDIR="${BUILDDIR}/firefox-${PVER}esr"
 
-sminclude python
+sminclude multilib python
 msetfeature "!check"
 
 SRC_URI=(
@@ -42,21 +42,28 @@
 	mpatch ${PNAME}-52.7.3-disable-mozglue.patch || die
 	mpatch ${PNAME}-52.8.0-include-configure-script.patch || die
 
-	sed -i '/^rm -rf _virtualenv/d' configure.in || die
-	sed -i '/^mkdir -p _virtualenv/d' configure.in || die
-
-	install -d _virtualenv/bin || die
-	cp -a /usr/bin/python-m32 _virtualenv/bin || die
-	cp -a /usr/bin/python-m64 _virtualenv/bin || die
-	cp -a /usr/bin/python$(mget-python-version)-m32 _virtualenv/bin || die
-	cp -a /usr/bin/python$(mget-python-version)-m64 _virtualenv/bin || die
+	# create missing python execs on multilib systems
+	if [[ ${ARCH} = x86_64 ]] && [[ $(mlibdir) != lib ]]
+	then
+		for abi in ${MULTILIB_ABIS}
+		do
+			cd ${SRCDIR}-${abi}
+			sed -i '/^rm -rf _virtualenv/d' configure.in || die
+			sed -i '/^mkdir -p _virtualenv/d' configure.in || die
+
+			install -d _virtualenv/bin || die
+			cp -a /usr/bin/python-m32 _virtualenv/bin || die
+			cp -a /usr/bin/python-m64 _virtualenv/bin || die
+			cp -a /usr/bin/python$(mget-python-version)-m32 _virtualenv/bin || die
+			cp -a /usr/bin/python$(mget-python-version)-m64 _virtualenv/bin || die
+		done
+	fi
 
 	export WANT_AUTOCONF=2.1
-	autoconf || die
+	all-abis autoconf || die
 
-	cd ${SRCDIR}/js/src
 	export WANT_AUTOCONF=2.1
-	autoconf || die
+	SRCSUBDIR="js/src" all-abis autoconf || die
 }
 
 src_compile()
@@ -68,14 +75,13 @@
 	export CXX=g++
 	export SHELL="${SHELL}"
  
-	cd ${SRCDIR}/js/src
-
+	SRCSUBDIR="js/src" \
 	mconfigure \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-strip \
 		--enable-gold \
-		--enable-optimize="-O2"
+		--enable-optimize="-O2" \
 		--enable-pie \
 		--enable-posix-nspr-emulation \
 		--enable-readline \
@@ -89,11 +95,10 @@
 
 	# shell export fixes some bugs in a chroot environment
 	# see: http://comments.gmane.org/gmane.linux.lfs.beyond.support/47450
-	SHELL="${SHELL}" mmake || die
+	SHELL="${SHELL}" SRCSUBDIR="js/src" mmake || die
 }
 
 src_install()
 {
-	cd ${SRCDIR}/js/src
-	SHELL="${SHELL}" mmake DESTDIR=${BINDIR} install || die
+	SHELL="${SHELL}" SRCSUBDIR="js/src" mmake DESTDIR=${BINDIR} install || die
 }