From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5172059CB1 for ; Mon, 11 Apr 2016 13:31:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40FDD21C009; Mon, 11 Apr 2016 13:31:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C826B21C009 for ; Mon, 11 Apr 2016 13:31:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D3C59340B30 for ; Mon, 11 Apr 2016 13:31:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B058720E for ; Mon, 11 Apr 2016 13:31:38 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1460380603.0bd19d05c7c7922a441d06236714dddae1a9e6b0.haubi@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 0bd19d05c7c7922a441d06236714dddae1a9e6b0 X-VCS-Branch: master Date: Mon, 11 Apr 2016 13:31:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 40f20794-9b46-4f04-b3cb-05cfe35cfcf4 X-Archives-Hash: f5181344ce5f82050722a0f97c20dd95 commit: 0bd19d05c7c7922a441d06236714dddae1a9e6b0 Author: Michael Haubenwallner ssi-schaefer com> AuthorDate: Mon Apr 11 13:14:46 2016 +0000 Commit: Michael Haubenwallner gentoo 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