commit: 1896ea58f9eef2916986ade1d46aa3e727fbccc7 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Fri Dec 29 13:25:28 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Fri Dec 29 13:25:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1896ea58
dev-lang/python: fix bootstrapping on Darwin, bug #642590 Closes: https://bugs.gentoo.org/642590 Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6 dev-lang/python/python-2.7.12.ebuild | 10 ++++--- dev-lang/python/python-2.7.14.ebuild | 53 ++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild index 3ee38dd690..040c3847e2 100644 --- a/dev-lang/python/python-2.7.12.ebuild +++ b/dev-lang/python/python-2.7.12.ebuild @@ -237,10 +237,12 @@ src_configure() { append-ldflags -L"${EPREFIX}"/$(get_libdir) append-ldflags -L"${EPREFIX}"/usr/$(get_libdir) # fix compilation on some 64-bits Linux hosts, #381163, #473520 - for hostlibdir in /usr/lib32 /usr/lib64 /usr/lib /lib32 /lib64; do - [[ -d ${hostlibdir} ]] || continue - append-ldflags -L${hostlibdir} - done + if use amd64-linux ; then + for hostlibdir in /usr/lib32 /usr/lib64 /usr/lib /lib32 /lib64; do + [[ -d ${hostlibdir} ]] || continue + append-ldflags -L${hostlibdir} + done + fi # Have to move $(CPPFLAGS) to before $(CFLAGS) to ensure that # local include paths - set in $(CPPFLAGS) - are searched first. sed -i -e "/^PY_CFLAGS[ \\t]*=/s,\\\$(CFLAGS)[ \\t]*\\\$(CPPFLAGS),\$(CPPFLAGS) \$(CFLAGS)," Makefile.pre.in || die diff --git a/dev-lang/python/python-2.7.14.ebuild b/dev-lang/python/python-2.7.14.ebuild index a97995fb67..28d3cb2f0b 100644 --- a/dev-lang/python/python-2.7.14.ebuild +++ b/dev-lang/python/python-2.7.14.ebuild @@ -175,27 +175,27 @@ src_prepare() { } src_configure() { - # dbm module can be linked against berkdb or gdbm. - # Defaults to gdbm when both are enabled, #204343. - local disable - use berkdb || use gdbm || disable+=" dbm" - use berkdb || disable+=" _bsddb" - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - [[ ${CHOST} == *64-apple-darwin* ]] && disable+=" Nav _Qt" # Carbon - [[ ${CHOST} == *-apple-darwin11 ]] && disable+=" _Fm _Qd _Qdoffs" - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi + # dbm module can be linked against berkdb or gdbm. + # Defaults to gdbm when both are enabled, #204343. + local disable + use berkdb || use gdbm || disable+=" dbm" + use berkdb || disable+=" _bsddb" + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + [[ ${CHOST} == *64-apple-darwin* ]] && disable+=" Nav _Qt" # Carbon + [[ ${CHOST} == *-apple-darwin11 ]] && disable+=" _Fm _Qd _Qdoffs" + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" @@ -228,7 +228,6 @@ src_configure() { replace-flags -Os -O3 # comment #14 fi - if use prefix ; then # for Python's setup.py not to do false assumptions (only looking in # host paths) we need to make explicit where Prefix stuff is @@ -236,10 +235,12 @@ src_configure() { append-ldflags -L"${EPREFIX}"/$(get_libdir) append-ldflags -L"${EPREFIX}"/usr/$(get_libdir) # fix compilation on some 64-bits Linux hosts, #381163, #473520 - for hostlibdir in /usr/lib32 /usr/lib64 /usr/lib /lib32 /lib64; do - [[ -d ${hostlibdir} ]] || continue - append-ldflags -L${hostlibdir} - done + if use amd64-linux ; then + for hostlibdir in /usr/lib32 /usr/lib64 /usr/lib /lib32 /lib64; do + [[ -d ${hostlibdir} ]] || continue + append-ldflags -L${hostlibdir} + done + fi # Have to move $(CPPFLAGS) to before $(CFLAGS) to ensure that # local include paths - set in $(CPPFLAGS) - are searched first. sed -i -e "/^PY_CFLAGS[ \\t]*=/s,\\\$(CFLAGS)[ \\t]*\\\$(CPPFLAGS),\$(CPPFLAGS) \$(CFLAGS)," Makefile.pre.in || die
