| 1 |
commit: fdf46bba0c421619255362815cdefa4c83d94bf5 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 23 04:48:33 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 23 04:49:45 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf46bba |
| 7 |
|
| 8 |
dev-lang/rust: drop -gentoo-linux-musl target support |
| 9 |
|
| 10 |
originally we intended to match musl stages CHOST vendor field |
| 11 |
but opted in for patching upstream -unknown-linux-musl target |
| 12 |
to use dynamic linking by default. |
| 13 |
|
| 14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-lang/rust/rust-1.64.0.ebuild | 23 ----------------------- |
| 17 |
1 file changed, 23 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-lang/rust/rust-1.64.0.ebuild b/dev-lang/rust/rust-1.64.0.ebuild |
| 20 |
index 1ff74e470d00..69b586f8f355 100644 |
| 21 |
--- a/dev-lang/rust/rust-1.64.0.ebuild |
| 22 |
+++ b/dev-lang/rust/rust-1.64.0.ebuild |
| 23 |
@@ -163,7 +163,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc |
| 24 |
PATCHES=( |
| 25 |
"${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch |
| 26 |
"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch |
| 27 |
- "${FILESDIR}"/1.61.0-gentoo-musl-target-specs.patch |
| 28 |
) |
| 29 |
|
| 30 |
S="${WORKDIR}/${MY_P}-src" |
| 31 |
@@ -293,11 +292,6 @@ src_configure() { |
| 32 |
for v in $(multilib_get_enabled_abi_pairs); do |
| 33 |
rust_targets+=",\"$(rust_abi ${chost_target})\"" |
| 34 |
done |
| 35 |
- if use elibc_musl; then |
| 36 |
- # we also want to build our -gentoo- target on musl, in addition to |
| 37 |
- # -unknown- one provided by upstream |
| 38 |
- rust_targets+="${rust_targets//-unknown-/-gentoo-}" |
| 39 |
- fi |
| 40 |
if use wasm; then |
| 41 |
rust_targets+=",\"wasm32-unknown-unknown\"" |
| 42 |
if use system-llvm; then |
| 43 |
@@ -459,27 +453,10 @@ src_configure() { |
| 44 |
fi |
| 45 |
# by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true; |
| 46 |
# but we patch it and set to false here as well |
| 47 |
- # also we enable extra -gentoo- vendor triplet target with same settings as above |
| 48 |
- # musl-sysroot needs to be defined because rust treats it like an extra cross target |
| 49 |
- # so HOST still stays -unknown-, but --tagrget xx-gentoo-linux-musl will have stdlib. |
| 50 |
if use elibc_musl; then |
| 51 |
cat <<- _EOF_ >> "${S}"/config.toml |
| 52 |
crt-static = false |
| 53 |
- [target.${rust_target//-unknown-/-gentoo-}] |
| 54 |
- musl-root = "${ESYSROOT}/usr" |
| 55 |
- ar = "$(tc-getAR)" |
| 56 |
- cc = "$(tc-getCC)" |
| 57 |
- cxx = "$(tc-getCXX)" |
| 58 |
- linker = "$(tc-getCC)" |
| 59 |
- ranlib = "$(tc-getRANLIB)" |
| 60 |
- llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)" |
| 61 |
_EOF_ |
| 62 |
- if use system-llvm; then |
| 63 |
- cat <<- _EOF_ >> "${S}"/config.toml |
| 64 |
- llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" |
| 65 |
- _EOF_ |
| 66 |
- fi |
| 67 |
- |
| 68 |
fi |
| 69 |
done |
| 70 |
if use wasm; then |
Archives