diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-11-06 23:21:37 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-11-11 11:21:09 +0100 |
| commit | 6cdbddf775a921788d0aa3cd3f757c0a1ac8cd37 (patch) | |
| tree | 85ff5837395cb34a641c0e4fb9978d674169af8f /eclass/tests | |
| parent | python-utils-r1.eclass: set PYTHON locally in python_export() (diff) | |
| download | gentoo-6cdbddf775a921788d0aa3cd3f757c0a1ac8cd37.tar.gz gentoo-6cdbddf775a921788d0aa3cd3f757c0a1ac8cd37.tar.bz2 gentoo-6cdbddf775a921788d0aa3cd3f757c0a1ac8cd37.zip | |
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.
Diffstat (limited to 'eclass/tests')
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index bd05e9ebc3c3..dc6676b6ca37 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,10 @@ test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7 test_var EPYTHON python3_4 python3.4 test_var PYTHON python3_4 /usr/bin/python3.4 test_var PYTHON_SITEDIR python3_4 /usr/lib/python3.4/site-packages -test_var PYTHON_INCLUDEDIR python3_4 /usr/include/python3.4 +if [[ -x /usr/bin/python3.4 ]]; then + abiflags=$(/usr/bin/python3.4 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))') + test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}" +fi test_var PYTHON_LIBPATH python3_4 /usr/lib/libpython3.4$(get_libname) test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4' test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4 @@ -86,14 +91,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 |