Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/
Date: Mon, 14 Dec 2015 20:39:28
Message-Id: 1450125549.81dce654da1e20abd66c4b8e91c327ebfb61b8d2.grobian@gentoo
1 commit: 81dce654da1e20abd66c4b8e91c327ebfb61b8d2
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 14 20:39:09 2015 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 14 20:39:09 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=81dce654
7
8 dev-lang/python: fix compilation on OSX, bug #568104
9
10 Package-Manager: portage-2.2.20-prefix
11
12 dev-lang/python/python-2.7.11.ebuild | 5 +----
13 1 file changed, 1 insertion(+), 4 deletions(-)
14
15 diff --git a/dev-lang/python/python-2.7.11.ebuild b/dev-lang/python/python-2.7.11.ebuild
16 index 14035f3..5b9eb05 100644
17 --- a/dev-lang/python/python-2.7.11.ebuild
18 +++ b/dev-lang/python/python-2.7.11.ebuild
19 @@ -426,9 +426,6 @@ src_install() {
20 pushd "${D}${fwdir}"/Versions/${SLOT}/lib > /dev/null
21 ln -s ../../../../python${SLOT} || die
22 popd > /dev/null
23 - # remove now dead symlinks
24 - rm "${ED}"/usr/lib/python${SLOT}/config/libpython${SLOT}.a
25 - rm "${ED}"/usr/lib/python${SLOT}/config/libpython${SLOT}.dylib
26
27 # fix up Makefile
28 sed -i \
29 @@ -545,7 +542,7 @@ EOF
30
31 # if not using a cross-compiler, use the fresh binary
32 if ! tc-is-cross-compiler; then
33 - local -x PYTHON=./python
34 + local -x PYTHON=./python$([[ ${CHOST} == *-darwin* ]] && echo ".exe")
35 local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
36 else
37 vars=( PYTHON "${vars[@]}" )