[gentoo-commits] repo/proj/libressl:master commit in: dev-util/maturin/

["orbea" <orbea@riseup.net>]

commit:     8ebf86b251863fa1d68477e337e1d8f12a055719
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Oct 22 01:07:20 2024 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Tue Oct 22 01:14:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8ebf86b2

dev-util/maturin: sync ::gentoo

Signed-off-by: orbea <orbea <AT> riseup.net>

 dev-util/maturin/maturin-1.6.0.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-util/maturin/maturin-1.6.0.ebuild b/dev-util/maturin/maturin-1.6.0.ebuild
index f0ab401..39c91ab 100644
--- a/dev-util/maturin/maturin-1.6.0.ebuild
+++ b/dev-util/maturin/maturin-1.6.0.ebuild
@@ -466,6 +466,7 @@ BDEPEND="
 		dev-python/boltons[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		dev-vcs/git
+		elibc_musl? ( dev-util/patchelf )
 	)
 "
 RDEPEND+=" ${DEPEND}"
@@ -506,6 +507,9 @@ src_prepare() {
 src_configure() {
 	export OPENSSL_NO_VENDOR=1
 
+	# bug #938847 (TODO?: should probably be an eclass default for musl)
+	use elibc_musl && RUSTFLAGS+=" -C target-feature=-crt-static"
+
 	# https://github.com/rust-lang/stacker/issues/79
 	use s390 && ! is-flagq '-march=*' &&
 		append-cflags $(test-flags-CC -march=z10)
@@ -536,7 +540,6 @@ python_compile_all() {
 }
 
 python_test() {
-	local -x COLUMNS=100 # match clap_builder crate default
 	local -x MATURIN_TEST_PYTHON=${EPYTHON}
 	local -x PIP_CONFIG_FILE=${T}/pip.conf
 	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
@@ -545,6 +548,8 @@ python_test() {
 	local -x PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
 
 	local skip=(
+		# picky cli output test that easily benignly fail (bug #937992)
+		--skip cli_tests
 		# avoid need for wasm over a single hello world test
 		--skip integration_wasm_hello_world
 		# fragile depending on rust version, also wants libpypy*-c.so for pypy