--- trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/04/30 12:01:20	30864
+++ trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/05/02 09:42:44	30869
@@ -20,7 +20,7 @@
 SRCDIR="${BUILDDIR}/mozilla-unified-FIREFOX_${PVER//./_}esr_RELEASE"
 
 EMUL_LINUX_32=true
-sminclude multilib
+sminclude multilib python
 msetfeature "!check"
 
 SRC_URI=(
@@ -41,6 +41,26 @@
 	mpatch ${PNAME}-${PVER}-copy-headers.patch || die
 	mpatch ${PNAME}-${PVER}-disable-mozglue.patch || die
 	mpatch ${PNAME}-${PVER}-include-configure-script.patch || 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
 }
 
 src_compile()
@@ -49,9 +69,8 @@
 	export CXXFLAGS+=' -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp -flto=3'
 	export CC=gcc
 	export CXX=g++
-	export PYTHON=/usr/bin/python2
  
-	SRCDIR="${SRCDIR}/js/src" \
+	SRCSUBDIR="js/src" \
 	mconfigure \
 		--disable-debug \
 		--disable-debug-symbols \
@@ -69,10 +88,10 @@
 		--without-system-icu \
 		|| die
 
-	SRCDIR="${SRCDIR}/js/src" mmake || die
+	SRCSUBDIR="js/src" mmake || die
 }
 
 src_install()
 {
-	SRCDIR="${SRCDIR}/js/src" mmake DESTDIR=${BINDIR} install || die
+	SRCSUBDIR="js/src" mmake DESTDIR=${BINDIR} install || die
 }