--- trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/05/02 11:42:43	30872
+++ trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/05/14 09:58:50	30879
@@ -19,8 +19,7 @@
 SRCFILE="FIREFOX_${PVER//./_}esr_RELEASE.tar.bz2"
 SRCDIR="${BUILDDIR}/mozilla-unified-FIREFOX_${PVER//./_}esr_RELEASE"
 
-EMUL_LINUX_32=true
-sminclude multilib python
+sminclude python
 msetfeature "!check"
 
 SRC_URI=(
@@ -37,53 +36,55 @@
 src_prepare()
 {
 	munpack ${SRCFILE} || die
+	cd ${SRCDIR}
+
 	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
+	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
+
+	export WANT_AUTOCONF=2.1
+	autoconf || die
 
+	cd ${SRCDIR}/js/src
 	export WANT_AUTOCONF=2.1
 	autoconf || die
 }
 
 src_compile()
 {
+	export CPPFLAGS=""
 	export CFLAGS+=' -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp -flto=3'
 	export CXXFLAGS+=' -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp -flto=3'
 	export CC=gcc
 	export CXX=g++
 	export SHELL="${SHELL}"
  
-	SRCSUBDIR="js/src" \
+	cd ${SRCDIR}/js/src
+
+	#	--enable-optimize="-O2"
+	# --enable-gold
 	mconfigure \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-strip \
 		--enable-gold \
-		--enable-optimize="-O2" \
+		--disable-optimize \
 		--enable-pie \
 		--enable-posix-nspr-emulation \
 		--enable-readline \
 		--enable-release \
 		--enable-shared-js \
-		--enable-tests \
+		--disable-tests \
 		--with-intl-api \
 		--with-system-zlib \
 		--without-system-icu \
@@ -91,10 +92,11 @@
 
 	# 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
+	SHELL="${SHELL}" mmake || die
 }
 
 src_install()
 {
-	SRCSUBDIR="js/src" SHELL="${SHELL}" mmake DESTDIR=${BINDIR} install || die
+	cd ${SRCDIR}/js/src
+	SHELL="${SHELL}" mmake DESTDIR=${BINDIR} install || die
 }