Apply cross-compile fixes to python-2.7.5.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 48 insertions, 71 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 1ffbf8148db2..9d165e1ae7ff 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.707 2013/09/26 04:20:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.708 2013/09/26 19:17:17 floppym Exp $
+
+  26 Sep 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/python-2.7.5-nonfatal-compileall.patch, python-2.7.5-r2.ebuild:
+  Apply cross-compile fixes to python-2.7.5.
 
   26 Sep 2013; Mike Gilbert <floppym@gentoo.org> python-3.3.2-r2.ebuild:
   Fix/simplify cross-compiles.
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index f0d220e279b7..dc6bbb339d6b 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -8,6 +8,7 @@ AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac6
 AUX pydoc.init 741 SHA256 913be80dea585dd161d2fd439f56a358f148853d8305cb0dbf113c91eb1643f5 SHA512 9806c6ecf55f51b74b7cf4088c22043838cee8e8192b0bd33289c80ca86f96469bcef7ad110f654505109aa325fcfcc4e54e9494c8dccef13447d12c89f00152 WHIRLPOOL 73d5e45039bc054ed5217503b0ef3d96fc8701e2c0a69342118c0e5a89949a5afb2228827e97a654868f916620578a4a8fd2fba2dc60c6850c3f61affc0dfa28
 AUX python-2.5-tcl86.patch 615 SHA256 cc649fbd471c7e348fc64f3844d9f4e1aab604cb3a028c9fb2cc58ba816b7bda SHA512 dca5eaff3ba981d699805c310dba0a7412ab2b856256ef25e41eb49e1441c382f868406ddce04a1e9768ccfacab1fb39e5e7a320f4ca6884a51583ca61a77dc8 WHIRLPOOL 515f1a5a163d4b34adff2b8e10e43c83f9575f185391440cf89155076b0399d3c5249e5a8741894d94092af4c5271c125b032bbc76c9e4e6f6d94f26133e5672
 AUX python-2.7.5-library-path.patch 991 SHA256 ff7a4a1846ebcadc2dbf979ea619072caac22e47909fe188fc4b6becce6ea2eb SHA512 74916d541eb38c526dc1243fe5e5a9de3a7875f02c53e5f49e60182ba042de2f15514364e7fbd821146dcf92db2bba88d8a9f46d4c71237b73fd39cbabf93d85 WHIRLPOOL 62bb1c85941ccaac7ca6f6fb2d93dc27f206cf9f815b90ef1f89748dfdd1d38deda9f6bf7eb2ce9fd8635d1a77576819192e8049ec5de52fdeb9f981dfb32f9f
+AUX python-2.7.5-nonfatal-compileall.patch 750 SHA256 3f5a137602f1b3f0522f561c168a740f0080b29c2c888cb3a8dbbcc4407c2d9e SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6 WHIRLPOOL ab576e3a4e67f881d6d5c705503230ace125fe94d907d7f69bb573dd492070b8b34078a2b1205f315eb45244fbae8855c0f15ce35158f1d356f1bd4acf83b3c2
 AUX python-2.7.5-re_unsigned_ptrdiff.patch 941 SHA256 5b0c0465a23d27e1c8f0961a8d88b3af75fbc9933ab60c2a71091720a3681079 SHA512 d46fbbc8411fae78cdfca2564faca42f32bb95ee348b9aa3fd1ca90b346cc52cd468945cee07e6df4dff46c10cee6856a58004f8e453960f6dca2751c077802b WHIRLPOOL 10bb08242dd9a055f6bdaf3eb1546786b58f180667c6355ea7276114cbac0ffba6c34822add7965fe3b5d41cc92ce8ec45e2d1d56377d8a6aa2755ef4267d101
 AUX python-3.2-CVE-2013-2099.patch 2102 SHA256 76a89951e7efcf14d37e30e0104446429ca121c68cbb1753ec362a177c1b5a54 SHA512 03d2a09fe730bf8c94df1eb10f8bac37a31a28dfb45b7d49abe1c3ffe26ca948f8d00eb58319d34102f8a747a038d447d3507b11c051c778c42ae21ac1066c8e WHIRLPOOL 3cd701c606ef1f4f557d1d250af41a860a6a5c4b6d9ff9a9f469ab6974f13e1205d2c4c791e9bd353fd4ff726f6cbf979f9a3927b83b04af5128c1aea7070496
 AUX python-3.2.3-x32.patch 654 SHA256 dd957a8ff5d861c0b8f88f068c8bd4eebb84c58ec6b12466d15812e666f08913 SHA512 d9d528bc4e3bd4f16bb7cbd5135e02bf61c6e430ac0e81f18884013fd16c04f6c1368f54356dc6beefb40dee964cb81d5e6debe586905738311b863673b26d4b WHIRLPOOL 166ac0611176c313729ad2245c0549c7017553073646015d2d29fa0da7f56e264b6e3402e5c1c93378b94669328dc293dbd02776e10d13e5f97455e4df694298
@@ -36,7 +37,7 @@ EBUILD python-2.6.8-r3.ebuild 11037 SHA256 24c963b0487a032ec2ff2be00eb9452764caa
 EBUILD python-2.7.3-r2.ebuild 9896 SHA256 d5b1caf8eda518ef76c685c4abc2173c0bd52ed5b2ae8c763e60246a81c218b5 SHA512 44aa720dc5ba44c4a0f2b0703cd7a65da24606c2de18a58444f034aa6817c032c6a13beec8c7fa1a6f2cad8f20c3b2524a74a47df819dcdead87485fcaf16cb0 WHIRLPOOL bb654895b33364214d2ef8038543498a5d4b0d67d1684dff7f90b8305e47d98a02a6e4c942291a218fa4cc3b9d4fcdce5010a0cdde0c339ac16b191eddec111e
 EBUILD python-2.7.3-r3.ebuild 11610 SHA256 11a3828b7854e0819febb8b9b9b812a0d7f557a4350ff9dd26b33f423350e0ce SHA512 f254e96b6fa15b99cfeae0e1c7ef71a440a67deb003588ebbc8c44e44dc2c5b3af858377509330d0e522981f7791e1bd0872cbd05c4669de72b3c7e915e15b4c WHIRLPOOL 9767c6d3ec0c09186b0cb06705e080f3233d3f7827120cec5ef1bb73fd916acbb74791998ab81cd5873a34479dc7bb5f7846dcdb3001bfa3b3b7ff5e552d11c5
 EBUILD python-2.7.5-r1.ebuild 11643 SHA256 3f142eead165c370529d4324b3656caf902e28be04e9e2705102e366fe1d9d95 SHA512 4f33adbf5ee7e2bd307d9360eca5ce04dc726b8bf1304150e9c8125844e3c75590c6128abc8893b816d752a2cf12057d10667df8dba06be51e398b90e83a3d81 WHIRLPOOL 922984a30b6c739c2318173ccc7e9b7e0db45dc1b9fe82bf2bea21eb93f139ed84ffc92d01cdb59dc88991cf321c312ccfb68cd1d2eacc58cc21015d090c14b6
-EBUILD python-2.7.5-r2.ebuild 11680 SHA256 210334788e1beece118f7319f7cf09394a825ccbd80312a998773569b75919f5 SHA512 cd669d81a51c7de29e92df9116c697b8fe58cf02e40ba3ebda99709908510bde551aae6f2c62d1a3d7b9ae96b6a4791686a525cf3bbd2d984610ba406d58413f WHIRLPOOL 74ba349f78a84cee0a728afbc545a80310e88583e8e8736a82750354e4685c8e5da9c9e4dd3cde878a8b623869a4e4464eb47257fd118256fd8468f7a751b3b9
+EBUILD python-2.7.5-r2.ebuild 10238 SHA256 8bd2345a9487a1650a8504e05c0594f85b2014c5235f7b3674f2f0b2254097de SHA512 65ec911ebedabb33b52505957acfce9b8a05fb876f5301c738a399f487ffe849c8155428b60ec1ccf5e230b9e2dee1a2c9f8e48353f72b8b862d82db7a9349e2 WHIRLPOOL b0a778ce8c47ded3851b8ba5614b066a864acaa0e80d1327567df77c35a86285c72037e487357bd0669ff2fca5d7aa649a23bd8de77d336d3132504a59e4fc02
 EBUILD python-2.7.5.ebuild 11570 SHA256 83901dcaf8f0b3263a2ef46317de3d69c3c1bc142992e1691f6ff3730ffdf845 SHA512 e1e2ca5d60cb5afa60bd1ebb51e56900630cdb9f4ae05be13912c7c7a40e11404b2a7858d9d1ab99d9bc5aa81a98adaadaa76f4c77d6afa94a59933409dab557 WHIRLPOOL 94fa17aa9cb0493855635e7fb8f4a0112e133cc0d5bc18ce70c55ed7e843ecc7145d06ffc47c241ced46313f8fec82cc19c821497ecb2914235cbc1fd79d6a61
 EBUILD python-3.2.3-r1.ebuild 8863 SHA256 e052278f8e2ca1a2f7c58dc00a933d2255eec9ca81149ba103e91db776952d97 SHA512 ad2e17d450bdf9fc4d82772d6efc2076984e970dc46aae723fb514dc0fda5878839d4a773e9cfe5f10ce30a748917ab0998de9d0db87c07c48d9c3528771dc81 WHIRLPOOL 026a093d91195db0f9e665bda5d0787e0b74474aae47b81fd5ef41a1666d3142d3c05ac58ee4dc5fbbfd074d652d3dbfd39c2fbba944ba3b9dfaab7c2942308e
 EBUILD python-3.2.3-r2.ebuild 10697 SHA256 7065fb62b1899a192ce365b57d62585587ac611f269ad0de4ee8dd0e647a7605 SHA512 ee92e932ddc0babf03b710933f7f095713b92cbdd05e889bdca2ba5d3883f85ef87c73a798aae94f44326ed644fe6a34b7b5c856fa03a3bf6771bb39644b6be9 WHIRLPOOL 0d2a60bb2b42d4add7311123298a95b551c7a9bd1a9baca508fa46afc8a3a6f8740a484cd38460991345bb088d00d52ae4d5d5daa50490b3ad01df5c556bc67f
@@ -49,13 +50,13 @@ EBUILD python-3.3.1.ebuild 10327 SHA256 acc8bf150c950425ffa77bcbfef078d5d127e3be
 EBUILD python-3.3.2-r1.ebuild 10493 SHA256 6eebe920daf5d08ea2c5761ae742a634b515f18de7f00c6e95620f4be72b1d2b SHA512 4700e06fec2cd4c9ebb76810c7edd2b01e15ed0c4e670b2974f7136a6ced88ee1bae9069403f73f1765a64ef9f7a6bb098f74fff3fcb9580c25d10ed77bb4f3c WHIRLPOOL 5a4d85e9210ec690dc692fade25128c6ba5cc77b4b188820887081f43f5a0c78c4bba21b516e63b2f26be9bcd8b717cbc8b4fe06f234204865fac8b2a9ef0fb0
 EBUILD python-3.3.2-r2.ebuild 9177 SHA256 cecfb8d243272144aa99ade70d943d84f330aa03ba7809b1a3b8922abba0abba SHA512 bdacd70338cfb1b700a6c481affa2980ebe74b1ab4d563390eb3df0e5e202b9bbbb6309582c3cf2ac4a123a4b7ada69746c31132626568ba86edd928b49cfdc5 WHIRLPOOL e45c1a6f4fb35f745b945bca209c2bbdbab4fba7957825b61c5d80e01b76eeab54b14e9a13b07acc04aa35a53cb729cbdffe5c630ff1c322a7e82ef270c4b95b
 EBUILD python-3.3.2.ebuild 10436 SHA256 b2329b310e186d1e55e20361ce0dff77fd49e61e560d3f4a6ade3cbe1857d1f3 SHA512 409a2bbcbaa9ca5f50d59c4e2b2bb2b601e6b107b571b598fc3f434ada25238af276308509fa73d1f5f234b26b8b7a9a978f09cddf0cdf21c7dd82c00b2ef937 WHIRLPOOL 9e19f2f8de30dbed870f016d6c6db50f282330f071c95ee145275e6f0e7755be6b06aa7346d46e54516af5dbf878d6f61c5955e8153d21a170bf391ec32704bb
-MISC ChangeLog 25151 SHA256 940da37b38b944a4753bc22ede700ba6edc827aadc927ea5cfb41afe64ea398a SHA512 e1195f44947bc579720018eadd23bbc6253b4e1d85991a43c4fcf11f72aad13ccfc9c1257b1daafe24abd3c5ac24ccdccedb77b4452da1da5b00ada6a632784b WHIRLPOOL 465be527878b528dbbf3f1895b41981684656f467abb2f4f0ed813c4ac6a2335c79c96917a1d3ac058045db21419aad1cdf97b58c9c5e6ca8a3b1e22467f06cf
+MISC ChangeLog 25319 SHA256 e430a592f5742c2da7f7286499fe741132c4e2ea2b4d071c8fcdbef1a766551f SHA512 2cce41d9223d67fe0e751b486ffc2219b3082525514e2b9704d7f92fa96d24f9007e18b9a17a0bb2bfa185bba1ee9643c8e918af44cbcc84ee8d4ae8a2b91ecf WHIRLPOOL 1aa6b509d24337b1db5df03bab14162fc4468b1a8e5aa850f7a01033ff485c51d61d72e46fa49ec8106ebe12b081d5038d16424c970612bf76d2d55faf89a842
 MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
 MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlJDtgwACgkQC77qH+pIQ6SbGQD8DEEq6bsHOxLPyubG31jN0FBo
-Nosd8iBTNdawxJtXh6cBAMrISoeOEjKfJ+0p2ATgjSu5JEubNeYgVq2Q9/uKsLBk
-=5rkB
+iF4EAREIAAYFAlJEiD4ACgkQC77qH+pIQ6TMygEAn4gj7+787nz94w5b+hyrCNpi
+o3vPLD2pVbp2eKDxVzIBAKJx24Opwo2uA0D9Xi2XsAgEi7w2GbZey94M2Re6MQr1
+=Jo0Q
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch b/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch
new file mode 100644
index 000000000000..a762dfb10882
--- /dev/null
+++ b/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1000,12 +1000,12 @@
+ 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+ 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
+ 	fi
+-	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
++	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+-	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
diff --git a/dev-lang/python/python-2.7.5-r2.ebuild b/dev-lang/python/python-2.7.5-r2.ebuild
index 5e3189fdeb6e..ee85ac8b0bc6 100644
--- a/dev-lang/python/python-2.7.5-r2.ebuild
+++ b/dev-lang/python/python-2.7.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.5-r2.ebuild,v 1.13 2013/08/28 15:59:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.5-r2.ebuild,v 1.14 2013/09/26 19:17:17 floppym Exp $
 
 EAPI="4"
 WANT_AUTOMAKE="none"
@@ -90,18 +90,19 @@ src_prepare() {
 	rm -r Modules/_ctypes/libffi* || die
 	rm -r Modules/zlib || die
 
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
+	if tc-is-cross-compiler; then
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
 	fi
 
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
 
 	epatch "${FILESDIR}/${P}-library-path.patch" #474882
 	epatch "${FILESDIR}/${P}-re_unsigned_ptrdiff.patch" #476426
 	epatch "${FILESDIR}/CVE-2013-4238_py27.patch"
 
+	# Fix for cross-compiling.
+	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
+
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		Lib/distutils/command/install.py \
 		Lib/distutils/sysconfig.py \
@@ -164,27 +165,6 @@ src_configure() {
 		use hardened && replace-flags -O3 -O2
 	fi
 
-	# Run the configure scripts in parallel.
-	multijob_init
-
-	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
-
-	if tc-is-cross-compiler; then
-		(
-		multijob_child_init
-		cd "${WORKDIR}"/${CBUILD} >/dev/null
-		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
-		"${S}"/configure \
-			--{build,host}=${CBUILD} \
-			|| die "cross-configure failed"
-		) &
-		multijob_post_fork
-
-		# The configure script assumes it's buggy when cross-compiling.
-		export ac_cv_buggy_getaddrinfo=no
-		export ac_cv_have_long_long_format=yes
-	fi
-
 	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
 	tc-export CXX
 	# The configure script fails to use pkg-config correctly.
@@ -204,7 +184,10 @@ src_configure() {
 		dbmliborder+="${dbmliborder:+:}bdb"
 	fi
 
-	cd "${WORKDIR}"/${CHOST}
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
 	ECONF_SOURCE="${S}" OPT="" \
 	econf \
 		--with-fpectl \
@@ -219,42 +202,14 @@ src_configure() {
 		--enable-loadable-sqlite-extensions \
 		--with-system-expat \
 		--with-system-ffi
-
-	if tc-is-cross-compiler; then
-		# Modify the Makefile.pre so we don't regen for the host/ one.
-		# We need to link the host python programs into $PWD and run
-		# them from here because the distutils sysconfig module will
-		# parse Makefile/etc... from argv[0], and we need it to pick
-		# up the target settings, not the host ones.
-		sed -i \
-			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
-			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
-			Makefile{.pre,} || die "sed failed"
-	fi
-
-	multijob_finish
 }
 
 src_compile() {
-	if tc-is-cross-compiler; then
-		cd "${WORKDIR}"/${CBUILD}
-		# Disable as many modules as possible -- but we need a few to install.
-		PYTHON_DISABLE_MODULES=$(
-			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
-				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
-		) \
-		PTHON_DISABLE_SSL="1" \
-		SYSROOT= \
-		emake
-		# See comment in src_configure about these.
-		ln python ../${CHOST}/hostpython || die
-		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
-		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
-	fi
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c
 
-	cd "${WORKDIR}"/${CHOST}
-	default
+	cd "${BUILD_DIR}" || die
+	emake
 
 	# Work around bug 329499. See also bug 413751 and 457194.
 	if has_version dev-libs/libffi[pax_kernel]; then
@@ -271,7 +226,7 @@ src_test() {
 		return
 	fi
 
-	cd "${WORKDIR}"/${CHOST}
+	cd "${BUILD_DIR}" || die
 
 	# Skip failing tests.
 	local skipped_tests="distutils gdb"
@@ -305,7 +260,7 @@ src_test() {
 src_install() {
 	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
 
-	cd "${WORKDIR}"/${CHOST}
+	cd "${BUILD_DIR}" || die
 	emake DESTDIR="${D}" altinstall
 
 	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
@@ -354,9 +309,8 @@ src_install() {
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
-		local PYTHON=./python \
-			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-		export LD_LIBRARY_PATH
+		local PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
 	fi
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py