--- trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/04/30 14:51:41	30866
+++ trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/05/03 08:28:54	30873
@@ -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=(
@@ -45,17 +45,22 @@
 	# create missing python execs on multilib systems
 	if [[ ${ARCH} = x86_64 ]] && [[ $(mlibdir) != lib ]]
 	then
-		cd ${SRCDIR}
-		sed -i '/^rm -rf _virtualenv/d' configure.in || die
-		sed -i '/^mkdir -p _virtualenv/d' configure.in || die
-
-		local _mychost="${CHOST}"
-		install -d obj-${_mychost}/_virtualenv/bin || die
-		cp -a /usr/bin/python-m32 obj-${_mychost}/_virtualenv/bin || die
-		cp -a /usr/bin/python-m64 obj-${_mychost}/_virtualenv/bin || die
-		cp -a /usr/bin/python$(mget-python-version)-m32 obj-${_mychost}/_virtualenv/bin || die
-		cp -a /usr/bin/python$(mget-python-version)-m64 obj-${_mychost}/_virtualenv/bin || die
+		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()
@@ -64,14 +69,14 @@
 	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
+	export SHELL="${SHELL}"
  
 	SRCSUBDIR="js/src" \
 	mconfigure \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-strip \
-		--enable-gold \
+		--disable-gold \
 		--enable-optimize="-O2" \
 		--enable-pie \
 		--enable-posix-nspr-emulation \
@@ -84,10 +89,12 @@
 		--without-system-icu \
 		|| die
 
-	SRCSUBDIR="js/src" mmake || die
+	# shell export fixes some bugs in a chroot environment
+	# see: http://comments.gmane.org/gmane.linux.lfs.beyond.support/47450
+	SRCSUBDIR="js/src" SHELL="${SHELL}" mmake || die
 }
 
 src_install()
 {
-	SRCSUBDIR="js/src" mmake DESTDIR=${BINDIR} install || die
+	SRCSUBDIR="js/src" SHELL="${SHELL}" mmake DESTDIR=${BINDIR} install || die
 }