commit: 1c1b80d7d7047c206ff125145db081b820352bec Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Nov 7 09:39:25 2015 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Nov 7 09:39:25 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1b80d7
python-utils-r1.eclass tests: Update for new includedir and libpath Update PYTHON_INCLUDEDIR and PYTHON_LIBPATH tests to match new values, and run them only if the relevant Python interpreter is installed. eclass/tests/python-utils-r1.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index e49636a..4dae586 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -64,16 +64,20 @@ 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 -test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname) +if [[ -x /usr/bin/python2.7 ]]; then + test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7 + test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)" +fi test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7' 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 -test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname) +if [[ -x /usr/bin/python3.3 ]]; then + test_var PYTHON_INCLUDEDIR python3_3 "/usr/include/python3.3*" + test_var PYTHON_LIBPATH python3_3 "/usr/lib*/libpython3.3*$(get_libname)" +fi 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
