| 1 |
commit: c9c2e1e4cd1cc1306c3ab8f533cea6bbccf90f94 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 26 06:43:45 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 26 06:43:45 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c9c2e1e4 |
| 7 |
|
| 8 |
eclass/python-utils-r1: sync with gx86 |
| 9 |
|
| 10 |
this is mostly for python3_9 support |
| 11 |
|
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/python-utils-r1.eclass | 20 ++++++++++---------- |
| 15 |
1 file changed, 10 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
| 18 |
index 87f0821b68..0caece1344 100644 |
| 19 |
--- a/eclass/python-utils-r1.eclass |
| 20 |
+++ b/eclass/python-utils-r1.eclass |
| 21 |
@@ -41,7 +41,7 @@ inherit toolchain-funcs |
| 22 |
_PYTHON_ALL_IMPLS=( |
| 23 |
pypy3 |
| 24 |
python2_7 |
| 25 |
- python3_6 python3_7 python3_8 |
| 26 |
+ python3_6 python3_7 python3_8 python3_9 |
| 27 |
) |
| 28 |
readonly _PYTHON_ALL_IMPLS |
| 29 |
|
| 30 |
@@ -77,7 +77,7 @@ _python_impl_supported() { |
| 31 |
# keep in sync with _PYTHON_ALL_IMPLS! |
| 32 |
# (not using that list because inline patterns shall be faster) |
| 33 |
case "${impl}" in |
| 34 |
- python2_7|python3_[678]|pypy3) |
| 35 |
+ python2_7|python3_[6789]|pypy3) |
| 36 |
return 0 |
| 37 |
;; |
| 38 |
jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345]) |
| 39 |
@@ -361,10 +361,14 @@ _python_export() { |
| 40 |
local val |
| 41 |
|
| 42 |
case "${impl}" in |
| 43 |
- python*) |
| 44 |
- # python-2.7, python-3.2, etc. |
| 45 |
+ python2*|python3.6|python3.7*) |
| 46 |
+ # python* up to 3.7 |
| 47 |
val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die |
| 48 |
;; |
| 49 |
+ python*) |
| 50 |
+ # python3.8+ |
| 51 |
+ val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}-embed) || die |
| 52 |
+ ;; |
| 53 |
*) |
| 54 |
die "${impl}: obtaining ${var} not supported" |
| 55 |
;; |
| 56 |
@@ -395,16 +399,12 @@ _python_export() { |
| 57 |
case ${impl} in |
| 58 |
python2.7) |
| 59 |
PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';; |
| 60 |
- python3.3) |
| 61 |
- PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';; |
| 62 |
python*) |
| 63 |
PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; |
| 64 |
pypy) |
| 65 |
- PYTHON_PKG_DEP='>=dev-python/pypy-5:0=';; |
| 66 |
+ PYTHON_PKG_DEP='>=dev-python/pypy-7.3.0:0=';; |
| 67 |
pypy3) |
| 68 |
- PYTHON_PKG_DEP='>=dev-python/pypy3-5:0=';; |
| 69 |
- jython2.7) |
| 70 |
- PYTHON_PKG_DEP='dev-java/jython:2.7';; |
| 71 |
+ PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.0:0=';; |
| 72 |
*) |
| 73 |
die "Invalid implementation: ${impl}" |
| 74 |
esac |
Archives