From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/, eclass/tests/
Date: Sat, 7 Nov 2015 20:00:16 +0000 (UTC) [thread overview]
Message-ID: <1446926377.1e3233020cfe3e7309daf70f2a60617dfb559996.mgorny@gentoo> (raw)
commit: 1e3233020cfe3e7309daf70f2a60617dfb559996
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 22:21:37 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 19:59:37 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e323302
python-utils-r1.eclass: Obtain include directory from the interpreter
Obtain the Python include directory using the distutils.sysconfig module
of the Python interpreter rather than hardcoding values for it. This
makes the code more maintainable, and clears the way for re-enabling
ABIFLAGS on new Python versions.
eclass/python-utils-r1.eclass | 21 +++++++--------------
eclass/tests/python-utils-r1.sh | 16 ++++++++++++----
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 69166cf..a0274f6 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -138,6 +138,7 @@ _python_impl_supported() {
# The path to Python include directory.
#
# Set and exported on request using python_export().
+# Requires a proper build-time dependency on the Python implementation.
#
# Example value:
# @CODE
@@ -279,21 +280,13 @@ python_export() {
debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
;;
PYTHON_INCLUDEDIR)
- local dir
- case "${impl}" in
- python*)
- dir=/usr/include/${impl}
- ;;
- pypy|pypy3)
- dir=/usr/$(get_libdir)/${impl}/include
- ;;
- *)
- die "${impl} lacks header files"
- ;;
- esac
-
- export PYTHON_INCLUDEDIR=${EPREFIX}${dir}
+ export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())')
debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
+
+ # Jython gives a non-existing directory
+ if [[ ! -d ${PYTHON_INCLUDEDIR} ]]; then
+ die "${impl} does not install any header files!"
+ fi
;;
PYTHON_LIBPATH)
local libname
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index e49636a..5bc3744 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -64,7 +64,9 @@ inherit python-utils-r1
test_var EPYTHON python2_7 python2.7
test_var PYTHON python2_7 /usr/bin/python2.7
test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages
-test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
+if [[ -x /usr/bin/python2.7 ]]; then
+ test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
+fi
test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname)
test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
@@ -72,7 +74,9 @@ test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
test_var EPYTHON python3_3 python3.3
test_var PYTHON python3_3 /usr/bin/python3.3
test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages
-test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3
+if [[ -x /usr/bin/python3.3 ]]; then
+ test_var PYTHON_INCLUDEDIR python3_3 "/usr/include/python3.3*"
+fi
test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname)
test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3'
test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
@@ -86,14 +90,18 @@ test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
test_var EPYTHON pypy pypy
test_var PYTHON pypy /usr/bin/pypy
test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages
-test_var PYTHON_INCLUDEDIR pypy /usr/lib/pypy/include
+if [[ -x /usr/bin/pypy ]]; then
+ test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy/include"
+fi
test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0='
test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
test_var EPYTHON pypy3 pypy3
test_var PYTHON pypy3 /usr/bin/pypy3
test_var PYTHON_SITEDIR pypy3 /usr/lib/pypy3/site-packages
-test_var PYTHON_INCLUDEDIR pypy3 /usr/lib/pypy3/include
+if [[ -x /usr/bin/pypy3 ]]; then
+ test_var PYTHON_INCLUDEDIR pypy3 /usr/lib/pypy3/include
+fi
test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0='
test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3
next reply other threads:[~2015-11-07 20:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-07 20:00 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-11-10 17:53 [gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/, eclass/tests/ Michał Górny
2015-11-10 17:53 Michał Górny
2015-11-10 17:53 Michał Górny
2015-11-10 17:53 Michał Górny
2015-11-08 8:42 Michał Górny
2015-11-07 19:58 Michał Górny
2015-11-07 19:58 Michał Górny
2015-11-07 19:44 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446926377.1e3233020cfe3e7309daf70f2a60617dfb559996.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox