From be50183ea9145968d0d79a976517d1fc0d7e7b2a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:07:20 +0000 Subject: [PATCH] eclass/distutils-r1: Sync with Gentoo It's from Gentoo commit 61b548c5d55986c662247789e07fecc54c7b3b1a. --- .../portage-stable/eclass/distutils-r1.eclass | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass index 357e64e6f7..a65dd3ef2a 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass @@ -271,7 +271,7 @@ _distutils_set_globals() { ;; maturin) bdep+=' - >=dev-util/maturin-1.4.0[${PYTHON_USEDEP}] + >=dev-util/maturin-1.7.4[${PYTHON_USEDEP}] ' ;; no) @@ -1257,13 +1257,21 @@ distutils_pep517_install() { cmd+=( cargo_env ) fi + # set it globally in case we were using "standalone" wrapper + local -x HATCH_METADATA_CLASSIFIERS_NO_VERIFY=1 + local -x VALIDATE_PYPROJECT_NO_NETWORK=1 + local -x VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS=1 + if in_iuse debug && use debug; then + local -x SETUPTOOLS_RUST_CARGO_PROFILE=dev + fi + case ${DISTUTILS_USE_PEP517} in maturin) # `maturin pep517 build-wheel --help` for options local maturin_args=( "${DISTUTILS_ARGS[@]}" + --auditwheel=skip # see bug #831171 --jobs="$(makeopts_jobs)" - --skip-auditwheel # see bug #831171 $(in_iuse debug && usex debug '--profile=dev' '') ) @@ -1348,9 +1356,6 @@ distutils_pep517_install() { ) ;; setuptools) - if in_iuse debug && use debug; then - local -x SETUPTOOLS_RUST_CARGO_PROFILE=dev - fi if [[ -n ${DISTUTILS_ARGS[@]} ]]; then config_settings=$( "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die