diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2022-12-08 17:46:37 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2022-12-14 11:16:10 +0100 |
| commit | a109fee99592d15cf1d4e93a9cd6c8462e094356 (patch) | |
| tree | bac6e8445e1003d848abe8f221a270396780be15 /eclass | |
| parent | x11-base/xorg-apps: stabilize 1 for ppc64 (diff) | |
| download | gentoo-a109fee99592d15cf1d4e93a9cd6c8462e094356.tar.gz gentoo-a109fee99592d15cf1d4e93a9cd6c8462e094356.tar.bz2 gentoo-a109fee99592d15cf1d4e93a9cd6c8462e094356.zip | |
distutils-r1.eclass: Require meson-python >= 0.11.0
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/distutils-r1.eclass | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 97c5e562bc0f..65004ba856f9 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -236,7 +236,7 @@ _distutils_set_globals() { ;; meson-python) bdep+=' - >=dev-python/meson-python-0.10.0-r1[${PYTHON_USEDEP}] + >=dev-python/meson-python-0.11.0[${PYTHON_USEDEP}] ' ;; pbr) @@ -1312,29 +1312,24 @@ distutils_pep517_install() { local config_settings= case ${DISTUTILS_USE_PEP517} in meson-python) - # TODO: remove the condition once we BDEP on >=0.11 - if has_version -b ">=dev-python/meson-python-0.11"; then - local -x NINJAOPTS=$(get_NINJAOPTS) - config_settings=$( - "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die - import json - import os - import shlex - import sys - - ninjaopts = shlex.split(os.environ["NINJAOPTS"]) - print(json.dumps({ - "setup-args": sys.argv[1:], - "compile-args": [ - "-v", - f"--ninja-args={ninjaopts!r}", - ], - })) - EOF - ) - elif [[ -n ${DISTUTILS_ARGS[@]} ]]; then - die "DISTUTILS_ARGS requires >=dev-python/meson-python-0.11 (missing BDEP?)" - fi + local -x NINJAOPTS=$(get_NINJAOPTS) + config_settings=$( + "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die + import json + import os + import shlex + import sys + + ninjaopts = shlex.split(os.environ["NINJAOPTS"]) + print(json.dumps({ + "setup-args": sys.argv[1:], + "compile-args": [ + "-v", + f"--ninja-args={ninjaopts!r}", + ], + })) + EOF + ) ;; setuptools) if [[ -n ${DISTUTILS_ARGS[@]} ]]; then |