commit: 0bd19d05c7c7922a441d06236714dddae1a9e6b0
Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer
<DOT> com>
AuthorDate: Mon Apr 11 13:14:46 2016 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 13:16:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0bd19d05
cygwin needs version in BUILDPYTHON already for static linking
scripts/bootstrap-prefix.sh | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bce5ab8..fbd9898 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -680,6 +680,24 @@ bootstrap_python() {
patch -p0 < "${DISTDIR}"/02_all_disable_modules_and_ssl.patch
fi
+ # --disable-shared causes modules to probably link against the
+ # executable name, which must be the real executable at runtime
+ # as well rather than some symlink (for Cygwin at least).
+ patch -p0 <<'EOP'
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -185,1 +185,1 @@
+-BUILDPYTHON= python$(BUILDEXE)
++BUILDPYTHON= python$(VERSION)$(BUILDEXE)
+@@ -984,1 +984,1 @@
+- export EXE; EXE="$(BUILDEXE)"; \
++ export HOSTPYTHON; HOSTPYTHON="$(HOSTPYTHON)"; \
+--- Lib/plat-generic/regen
++++ Lib/plat-generic/regen
+@@ -3,1 +3,1 @@
+-python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
++$HOSTPYTHON ../../Tools/scripts/h2py.py -i '(u_long)'
/usr/include/netinet/in.h
+EOP
local myconf=""
case $CHOST in
