diff options
| author | adam <adam@pkgsrc.org> | 2021-10-05 19:08:13 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2021-10-05 19:08:13 +0000 |
| commit | 98302a244118546dcc4d4836b28fd007ef33e1a5 (patch) | |
| tree | 1fbdb583893ad5c4ea9ff157be2a53a84aad73ec /lang/python | |
| parent | ffca424c7a47fffd717ec771bce773ef794b6661 (diff) | |
| download | pkgsrc-98302a244118546dcc4d4836b28fd007ef33e1a5.tar.gz | |
Add support for Python 3.10
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/plist-python.awk | 4 | ||||
| -rw-r--r-- | lang/python/pyversion.mk | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lang/python/plist-python.awk b/lang/python/plist-python.awk index 57f700aa988..702887ee47d 100644 --- a/lang/python/plist-python.awk +++ b/lang/python/plist-python.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-python.awk,v 1.2 2015/12/05 17:12:13 adam Exp $ +# $NetBSD: plist-python.awk,v 1.3 2021/10/05 19:08:13 adam Exp $ # # Copyright (c) 2012 The NetBSD Foundation, Inc. # All rights reserved. @@ -45,7 +45,7 @@ BEGIN { /^[^@]/ && /[^\/]+\.py[co]$/ { sub(/[^\/]+\.py[co]$/, "__pycache__/&") sub(/\.py[co]$/, ".cpython-" PYVERS "&") - if (PYVERS ~ /^3[5-9]$/ && $0 ~ /\.pyo$/) { + if (PYVERS ~ /^3[0-9]+$/ && $0 ~ /\.pyo$/) { sub(/\.pyo$/, ".opt-1.pyc") } } diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 71c7ab977a0..b68ba7cb8a2 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.137 2021/10/01 12:27:47 nia Exp $ +# $NetBSD: pyversion.mk,v 1.138 2021/10/05 19:08:13 adam Exp $ # This file determines which Python version is used as a dependency for # a package. @@ -8,7 +8,7 @@ # PYTHON_VERSION_DEFAULT # The preferred Python version to use. # -# Possible values: 27 36 37 38 39 +# Possible values: 27 36 37 38 39 310 # Default: 39 # # === Infrastructure variables === @@ -27,13 +27,13 @@ # order of the entries matters, since earlier entries are # preferred over later ones. # -# Possible values: 39 38 37 36 27 -# Default: 39 38 37 36 27 +# Possible values: 310 39 38 37 36 27 +# Default: 310 39 38 37 36 27 # # PYTHON_VERSIONS_INCOMPATIBLE # The Python versions that are NOT acceptable for the package. # -# Possible values: 27 36 37 38 39 +# Possible values: 27 36 37 38 39 310 # Default: (empty) # # PYTHON_FOR_BUILD_ONLY @@ -85,7 +85,7 @@ BUILD_DEFS+= PYTHON_VERSION_DEFAULT BUILD_DEFS_EFFECTS+= PYPACKAGE PYTHON_VERSION_DEFAULT?= 39 -PYTHON_VERSIONS_ACCEPTED?= 39 38 37 36 27 +PYTHON_VERSIONS_ACCEPTED?= 310 39 38 37 36 27 PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default # transform the list into individual variables |