diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python-utils-r1.eclass | 7 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 796be7ab456a..555b6c561a18 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -41,6 +41,7 @@ inherit multiprocessing toolchain-funcs _PYTHON_ALL_IMPLS=( pypy3 python3_{10..13} + python3_13t ) readonly _PYTHON_ALL_IMPLS @@ -136,7 +137,7 @@ _python_set_impls() { # please keep them in sync with _PYTHON_ALL_IMPLS # and _PYTHON_HISTORICAL_IMPLS case ${i} in - pypy3|python3_9|python3_1[0-3]) + pypy3|python3_9|python3_1[0-3]|python3_13t) ;; jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-9]) obsolete+=( "${i}" ) @@ -232,7 +233,7 @@ _python_impl_matches() { return 0 ;; 3.8|3.9|3.1[1-3]) - [[ ${impl} == python${pattern/./_} ]] && return 0 + [[ ${impl%t} == python${pattern/./_} ]] && return 0 ;; *) # unify value style to allow lax matching @@ -435,7 +436,7 @@ _python_export() { or "") EOF ) - val=${PYTHON}${flags}-config + val=${PYTHON%t}${flags}-config ;; *) die "${impl}: obtaining ${var} not supported" diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 93cea324a3df..732f53381b22 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -64,7 +64,7 @@ tmpfile=$(mktemp) inherit python-utils-r1 -for minor in {10..13}; do +for minor in {10..13} 13t; do ebegin "Testing python3.${minor}" eindent test_var EPYTHON "python3_${minor}" "python3.${minor}" @@ -72,9 +72,9 @@ for minor in {10..13}; do if [[ -x /usr/bin/python3.${minor} ]]; then abiflags=$(/usr/bin/python3.${minor} -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))') test_var PYTHON_SITEDIR "python3_${minor}" "/usr/lib*/python3.${minor}/site-packages" - test_var PYTHON_INCLUDEDIR "python3_${minor}" "/usr/include/python3.${minor}${abiflags}" - test_var PYTHON_LIBPATH "python3_${minor}" "/usr/lib*/libpython3.${minor}${abiflags}$(get_libname)" - test_var PYTHON_CONFIG "python3_${minor}" "/usr/bin/python3.${minor}${abiflags}-config" + test_var PYTHON_INCLUDEDIR "python3_${minor}" "/usr/include/python3.${minor%t}${abiflags}" + test_var PYTHON_LIBPATH "python3_${minor}" "/usr/lib*/libpython3.${minor%t}${abiflags}$(get_libname)" + test_var PYTHON_CONFIG "python3_${minor}" "/usr/bin/python3.${minor%t}${abiflags}-config" test_var PYTHON_CFLAGS "python3_${minor}" "*-I/usr/include/python3.${minor}*" test_var PYTHON_LIBS "python3_${minor}" "*-lpython3.${minor}*" fi @@ -105,13 +105,13 @@ for minor in {10..13}; do tend ${?} # these tests apply to py3.8+ only - if [[ ${minor} -ge 8 ]]; then + if [[ ${minor%t} -ge 8 ]]; then tbegin "Testing that _python_verify_patterns accepts stdlib version" - ( _python_verify_patterns "3.${minor}" ) + ( _python_verify_patterns "3.${minor%t}" ) tend ${?} tbegin "Testing _python_impl_matches on stdlib version" - _python_impl_matches "python3_${minor}" "3.${minor}" + _python_impl_matches "python3_${minor}" "3.${minor%t}" tend ${?} fi |