diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2023-06-02 10:41:11 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2023-06-03 08:48:09 +0200 |
| commit | fbe490d5b3bce11c69e3102745487fb37c3dccc7 (patch) | |
| tree | ab753fa223c1d5bbabccf38ff668735454551981 /eclass/distutils-r1.eclass | |
| parent | distutils-r1.eclass: Remove support for old maturin (diff) | |
| download | gentoo-fbe490d5b3bce11c69e3102745487fb37c3dccc7.tar.gz gentoo-fbe490d5b3bce11c69e3102745487fb37c3dccc7.tar.bz2 gentoo-fbe490d5b3bce11c69e3102745487fb37c3dccc7.zip | |
distutils-r1.eclass: Remove support for old meson-python
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass/distutils-r1.eclass')
| -rw-r--r-- | eclass/distutils-r1.eclass | 51 |
1 files changed, 15 insertions, 36 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 12ed6e77b969..2f227fe75910 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -239,7 +239,7 @@ _distutils_set_globals() { ;; meson-python) bdep+=' - >=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}] + >=dev-python/meson-python-0.13.1[${PYTHON_USEDEP}] ' ;; pbr) @@ -1349,42 +1349,21 @@ distutils_pep517_install() { ;; meson-python) local -x NINJAOPTS=$(get_NINJAOPTS) - if has_version -b '>=dev-python/meson-python-0.13'; then - config_settings=$( - "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die - import json - import os - import shlex - import sys - - ninjaopts = shlex.split(os.environ["NINJAOPTS"]) - print(json.dumps({ - "builddir": "${BUILD_DIR}", - "setup-args": sys.argv[1:], - "compile-args": ["-v"] + ninjaopts, - })) - EOF - ) - else - config_settings=$( - "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die - import json - import os - import shlex - import sys + config_settings=$( + "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die + import json + import os + import shlex + import sys - ninjaopts = shlex.split(os.environ["NINJAOPTS"]) - print(json.dumps({ - "builddir": "${BUILD_DIR}", - "setup-args": sys.argv[1:], - "compile-args": [ - "-v", - f"--ninja-args={ninjaopts!r}", - ], - })) - EOF - ) - fi + ninjaopts = shlex.split(os.environ["NINJAOPTS"]) + print(json.dumps({ + "builddir": "${BUILD_DIR}", + "setup-args": sys.argv[1:], + "compile-args": ["-v"] + ninjaopts, + })) + EOF + ) ;; setuptools) if [[ -n ${DISTUTILS_ARGS[@]} ]]; then |