commit: 0d99493b897e65d694e1cdcc717addde9802baed Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Sep 1 12:09:32 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Sep 1 13:00:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d99493b
dev-util/maturin: force shared build & fix tests for musl While it'd be nice to propagate the shared build, can skip the revbump (that'd be useless for glibc users given already default) given it either failed to build, or segfaulted while generating completion files. If it was successfully installed then it should be usable. patchelf could be skipped if we disable auditwheel (like distutils-r1 does), but not aware of an easy way to pass this for tests and it may confuse them either way -- so just add the cheap dependency. Closes: https://bugs.gentoo.org/938847 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-util/maturin/maturin-1.6.0.ebuild | 4 ++++ dev-util/maturin/maturin-1.7.0.ebuild | 4 ++++ dev-util/maturin/maturin-1.7.1.ebuild | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dev-util/maturin/maturin-1.6.0.ebuild b/dev-util/maturin/maturin-1.6.0.ebuild index 0db2445f7122..74050422364e 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}" @@ -502,6 +503,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) diff --git a/dev-util/maturin/maturin-1.7.0.ebuild b/dev-util/maturin/maturin-1.7.0.ebuild index f08f88e3b8fa..59cc413d226f 100644 --- a/dev-util/maturin/maturin-1.7.0.ebuild +++ b/dev-util/maturin/maturin-1.7.0.ebuild @@ -421,6 +421,7 @@ BDEPEND=" dev-python/boltons[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] dev-vcs/git + elibc_musl? ( dev-util/patchelf ) ) " RDEPEND+=" ${DEPEND}" @@ -457,6 +458,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) diff --git a/dev-util/maturin/maturin-1.7.1.ebuild b/dev-util/maturin/maturin-1.7.1.ebuild index 745d1c4927b3..5de76563f32b 100644 --- a/dev-util/maturin/maturin-1.7.1.ebuild +++ b/dev-util/maturin/maturin-1.7.1.ebuild @@ -431,6 +431,7 @@ BDEPEND=" dev-python/boltons[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] dev-vcs/git + elibc_musl? ( dev-util/patchelf ) ) " RDEPEND+=" ${DEPEND}" @@ -467,6 +468,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)
