--- trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/04/30 11:31:25	30861
+++ trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/05/14 09:58:50	30879
@@ -16,15 +16,14 @@
 	>= app-arch/zip-3"
 
 # direct mecurial export
-SRCFILE="FIREFOX_{PVER//./_}esr_RELEASE.tar.bz2"
-SRCDIR="${BUILDDIR}/js-${PVER}/js/src"
+SRCFILE="FIREFOX_${PVER//./_}esr_RELEASE.tar.bz2"
+SRCDIR="${BUILDDIR}/mozilla-unified-FIREFOX_${PVER//./_}esr_RELEASE"
 
-EMUL_LINUX_32=true
-sminclude multilib mbuild
+sminclude python
 msetfeature "!check"
 
 SRC_URI=(
-	https://hg.mozilla.org/mozilla-unified/archive/${SRCFILE}
+	#https://hg.mozilla.org/mozilla-unified/archive/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 	mirror://${PNAME}/${PNAME}-${PVER}-fix-soname.patch
 	mirror://${PNAME}/${PNAME}-${PVER}-copy-headers.patch
@@ -37,36 +36,67 @@
 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
+
+	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 PYTHON=/usr/bin/python2
+	export SHELL="${SHELL}"
  
+	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 \
 		|| die
 
-	mmake || die
+	# shell export fixes some bugs in a chroot environment
+	# see: http://comments.gmane.org/gmane.linux.lfs.beyond.support/47450
+	SHELL="${SHELL}" mmake || die
+}
+
+src_install()
+{
+	cd ${SRCDIR}/js/src
+	SHELL="${SHELL}" mmake DESTDIR=${BINDIR} install || die
 }