--- trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/04/30 11:51:45	30863
+++ trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/05/02 11:36:07	30871
@@ -17,11 +17,10 @@
 
 # direct mecurial export
 SRCFILE="FIREFOX_${PVER//./_}esr_RELEASE.tar.bz2"
-PATCHDIR="${BUILDDIR}/mozilla-unified-FIREFOX_${PVER//./_}esr_RELEASE"
-SRCDIR="${PATCHDIR}/js/src"
+SRCDIR="${BUILDDIR}/mozilla-unified-FIREFOX_${PVER//./_}esr_RELEASE"
 
 EMUL_LINUX_32=true
-sminclude multilib mbuild
+sminclude multilib python
 msetfeature "!check"
 
 SRC_URI=(
@@ -38,10 +37,30 @@
 src_prepare()
 {
 	munpack ${SRCFILE} || die
-	SRCDIR="${PATCHDIR}" mpatch ${PNAME}-${PVER}-fix-soname.patch || die
-	SRCDIR="${PATCHDIR}" mpatch ${PNAME}-${PVER}-copy-headers.patch || die
-	SRCDIR="${PATCHDIR}" mpatch ${PNAME}-${PVER}-disable-mozglue.patch || die
-	SRCDIR="${PATCHDIR}" mpatch ${PNAME}-${PVER}-include-configure-script.patch || die
+	mpatch ${PNAME}-${PVER}-fix-soname.patch || die
+	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()
@@ -50,8 +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
  
+	SRCSUBDIR="js/src" \
 	mconfigure \
 		--disable-debug \
 		--disable-debug-symbols \
@@ -69,5 +88,12 @@
 		--without-system-icu \
 		|| die
 
-	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" SHELL="${SHELL}" mmake DESTDIR=${BINDIR} install || die
 }