commit: 3886694cfc570c60e72ba499f9b8af95e9d1fc90 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sat Apr 26 19:36:56 2025 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Sat Apr 26 19:36:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3886694c
dev-lang/rust: sync ::gentoo Signed-off-by: orbea <orbea <AT> riseup.net> .../files/1.72.0-bump-libc-deps-to-0.2.146.patch | 156 --------------------- dev-lang/rust/metadata.xml | 8 +- dev-lang/rust/rust-1.74.1-r101.ebuild | 1 - dev-lang/rust/rust-1.75.0-r101.ebuild | 1 - dev-lang/rust/rust-1.76.0-r101.ebuild | 1 - dev-lang/rust/rust-1.77.1-r101.ebuild | 1 - dev-lang/rust/rust-1.78.0-r101.ebuild | 1 - dev-lang/rust/rust-1.79.0-r101.ebuild | 1 - dev-lang/rust/rust-1.80.1-r101.ebuild | 1 - dev-lang/rust/rust-1.81.0-r101.ebuild | 1 - dev-lang/rust/rust-1.82.0-r102.ebuild | 1 - dev-lang/rust/rust-1.83.0-r2.ebuild | 1 - dev-lang/rust/rust-1.84.0-r1.ebuild | 12 +- dev-lang/rust/rust-1.84.1-r1.ebuild | 11 +- dev-lang/rust/rust-1.85.0-r1.ebuild | 11 +- dev-lang/rust/rust-1.85.0.ebuild | 11 +- dev-lang/rust/rust-1.85.1.ebuild | 11 +- dev-lang/rust/rust-1.86.0-r1.ebuild | 12 +- 18 files changed, 53 insertions(+), 189 deletions(-) diff --git a/dev-lang/rust/files/1.72.0-bump-libc-deps-to-0.2.146.patch b/dev-lang/rust/files/1.72.0-bump-libc-deps-to-0.2.146.patch deleted file mode 100644 index bd1c4b5..0000000 --- a/dev-lang/rust/files/1.72.0-bump-libc-deps-to-0.2.146.patch +++ /dev/null @@ -1,156 +0,0 @@ -This patch bumps all libc dependencies and checksums to 0.2.146, which includes the fix for musl 1.2.4. - ---- a/vendor/addr2line-0.20.0/Cargo.lock -+++ b/vendor/addr2line-0.20.0/Cargo.lock -@@ -246,9 +246,9 @@ checksum = "e2abad23fbc42b3700f2f279844d - - [[package]] - name = "libc" --version = "0.2.141" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "libtest-mimic" ---- a/vendor/backtrace-0.3.67/Cargo.lock -+++ b/vendor/backtrace-0.3.67/Cargo.lock -@@ -64,9 +64,9 @@ checksum = "dec7af912d60cdbd3677c1af9352 - - [[package]] - name = "libc" --version = "0.2.138" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "libloading" ---- a/vendor/bstr/Cargo.lock -+++ b/vendor/bstr/Cargo.lock -@@ -34,9 +34,9 @@ dependencies = [ - - [[package]] - name = "libc" --version = "0.2.138" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "memchr" ---- a/vendor/cranelift-jit/Cargo.lock -+++ b/vendor/cranelift-jit/Cargo.lock -@@ -224,9 +224,9 @@ dependencies = [ - - [[package]] - name = "libc" --version = "0.2.141" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "log" ---- a/vendor/crossbeam-channel/Cargo.lock -+++ b/vendor/crossbeam-channel/Cargo.lock -@@ -50,9 +50,9 @@ dependencies = [ - - [[package]] - name = "libc" --version = "0.2.141" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "num_cpus" ---- a/vendor/elasticlunr-rs/Cargo.lock -+++ b/vendor/elasticlunr-rs/Cargo.lock -@@ -555,9 +555,9 @@ checksum = "e2abad23fbc42b3700f2f279844d - - [[package]] - name = "libc" --version = "0.2.140" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "lindera" ---- a/vendor/handlebars/Cargo.lock -+++ b/vendor/handlebars/Cargo.lock -@@ -550,9 +550,9 @@ checksum = "e2abad23fbc42b3700f2f279844d - - [[package]] - name = "libc" --version = "0.2.140" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "lock_api" ---- a/vendor/icu_locid/Cargo.lock -+++ b/vendor/icu_locid/Cargo.lock -@@ -318,9 +318,9 @@ checksum = "e2abad23fbc42b3700f2f279844d - - [[package]] - name = "libc" --version = "0.2.141" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "litemap" ---- a/vendor/libffi/Cargo.lock -+++ b/vendor/libffi/Cargo.lock -@@ -10,9 +10,9 @@ checksum = "50d30906286121d95be3d479533b - - [[package]] - name = "libc" --version = "0.2.140" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "libffi" ---- a/vendor/terminal_size/Cargo.lock -+++ b/vendor/terminal_size/Cargo.lock -@@ -47,9 +47,9 @@ dependencies = [ - - [[package]] - name = "libc" --version = "0.2.140" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "linux-raw-sys" ---- a/vendor/tracing-tree/Cargo.lock -+++ b/vendor/tracing-tree/Cargo.lock -@@ -100,9 +100,9 @@ checksum = "e2abad23fbc42b3700f2f279844d - - [[package]] - name = "libc" --version = "0.2.141" -+version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index"; --checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" -+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - - [[package]] - name = "log" diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml index 94b0499..b2fefe0 100644 --- a/dev-lang/rust/metadata.xml +++ b/dev-lang/rust/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> + <maintainer type="project"> + <email>[email protected]</email> + <name>Rust Project</name> + </maintainer> <maintainer type="person" proxied="yes"> <email>[email protected]</email> <name>Randy Barlow</name> @@ -13,10 +17,6 @@ <email>[email protected]</email> <name>Matoro Mahri</name> </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Rust Project</name> - </maintainer> <use> <flag name="clippy">Install clippy, Rust code linter</flag> <flag name="dist">Install dist tarballs (used for bootstrapping)</flag> diff --git a/dev-lang/rust/rust-1.74.1-r101.ebuild b/dev-lang/rust/rust-1.74.1-r101.ebuild index e7102b7..e416e43 100644 --- a/dev-lang/rust/rust-1.74.1-r101.ebuild +++ b/dev-lang/rust/rust-1.74.1-r101.ebuild @@ -153,7 +153,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.62.1-musl-dynamic-linking.patch "${FILESDIR}"/1.67.0-doc-wasm.patch diff --git a/dev-lang/rust/rust-1.75.0-r101.ebuild b/dev-lang/rust/rust-1.75.0-r101.ebuild index cb523cb..4400d4d 100644 --- a/dev-lang/rust/rust-1.75.0-r101.ebuild +++ b/dev-lang/rust/rust-1.75.0-r101.ebuild @@ -143,7 +143,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.75.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch # This patch shouldn't be necessary for later versions of Rust because its diff --git a/dev-lang/rust/rust-1.76.0-r101.ebuild b/dev-lang/rust/rust-1.76.0-r101.ebuild index 9d6874a..7582f22 100644 --- a/dev-lang/rust/rust-1.76.0-r101.ebuild +++ b/dev-lang/rust/rust-1.76.0-r101.ebuild @@ -143,7 +143,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.75.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.75.0-handle-vendored-sources.patch diff --git a/dev-lang/rust/rust-1.77.1-r101.ebuild b/dev-lang/rust/rust-1.77.1-r101.ebuild index 7309e27..1c4722b 100644 --- a/dev-lang/rust/rust-1.77.1-r101.ebuild +++ b/dev-lang/rust/rust-1.77.1-r101.ebuild @@ -143,7 +143,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.75.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.76.0-loong-code-model.patch # remove for >=1.78.0 diff --git a/dev-lang/rust/rust-1.78.0-r101.ebuild b/dev-lang/rust/rust-1.78.0-r101.ebuild index 0860559..2e7eec2 100644 --- a/dev-lang/rust/rust-1.78.0-r101.ebuild +++ b/dev-lang/rust/rust-1.78.0-r101.ebuild @@ -143,7 +143,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.78.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.79.0-revert-8c40426.patch diff --git a/dev-lang/rust/rust-1.79.0-r101.ebuild b/dev-lang/rust/rust-1.79.0-r101.ebuild index 030dac5..9331016 100644 --- a/dev-lang/rust/rust-1.79.0-r101.ebuild +++ b/dev-lang/rust/rust-1.79.0-r101.ebuild @@ -143,7 +143,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.78.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.79.0-revert-8c40426.patch diff --git a/dev-lang/rust/rust-1.80.1-r101.ebuild b/dev-lang/rust/rust-1.80.1-r101.ebuild index 00862f4..be84364 100644 --- a/dev-lang/rust/rust-1.80.1-r101.ebuild +++ b/dev-lang/rust/rust-1.80.1-r101.ebuild @@ -143,7 +143,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.79.0-revert-8c40426.patch ) diff --git a/dev-lang/rust/rust-1.81.0-r101.ebuild b/dev-lang/rust/rust-1.81.0-r101.ebuild index 97c29ed..26b98ff 100644 --- a/dev-lang/rust/rust-1.81.0-r101.ebuild +++ b/dev-lang/rust/rust-1.81.0-r101.ebuild @@ -144,7 +144,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.79.0-revert-8c40426.patch "${FILESDIR}/1.81.0-backport-bug937164.patch" diff --git a/dev-lang/rust/rust-1.82.0-r102.ebuild b/dev-lang/rust/rust-1.82.0-r102.ebuild index 064785e..dc768d4 100644 --- a/dev-lang/rust/rust-1.82.0-r102.ebuild +++ b/dev-lang/rust/rust-1.82.0-r102.ebuild @@ -143,7 +143,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.82.0-dwarf-llvm-assertion.patch ) diff --git a/dev-lang/rust/rust-1.83.0-r2.ebuild b/dev-lang/rust/rust-1.83.0-r2.ebuild index eaea651..ad4b067 100644 --- a/dev-lang/rust/rust-1.83.0-r2.ebuild +++ b/dev-lang/rust/rust-1.83.0-r2.ebuild @@ -143,7 +143,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.83.0-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.83.0-dwarf-llvm-assertion.patch ) diff --git a/dev-lang/rust/rust-1.84.0-r1.ebuild b/dev-lang/rust/rust-1.84.0-r1.ebuild index fef734e..d291a0b 100644 --- a/dev-lang/rust/rust-1.84.0-r1.ebuild +++ b/dev-lang/rust/rust-1.84.0-r1.ebuild @@ -68,7 +68,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -144,7 +149,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.83.0-cross-compile-libz.patch - #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.67.0-doc-wasm.patch ) @@ -247,7 +251,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -403,7 +407,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.84.1-r1.ebuild b/dev-lang/rust/rust-1.84.1-r1.ebuild index f105bb8..49b00cb 100644 --- a/dev-lang/rust/rust-1.84.1-r1.ebuild +++ b/dev-lang/rust/rust-1.84.1-r1.ebuild @@ -68,7 +68,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -247,7 +252,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -403,7 +408,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.85.0-r1.ebuild b/dev-lang/rust/rust-1.85.0-r1.ebuild index 8b99207..47de1b8 100644 --- a/dev-lang/rust/rust-1.85.0-r1.ebuild +++ b/dev-lang/rust/rust-1.85.0-r1.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -319,7 +324,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -490,7 +495,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.85.0.ebuild b/dev-lang/rust/rust-1.85.0.ebuild index 9e78193..2e2c954 100644 --- a/dev-lang/rust/rust-1.85.0.ebuild +++ b/dev-lang/rust/rust-1.85.0.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -318,7 +323,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -489,7 +494,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.85.1.ebuild b/dev-lang/rust/rust-1.85.1.ebuild index 8b99207..47de1b8 100644 --- a/dev-lang/rust/rust-1.85.1.ebuild +++ b/dev-lang/rust/rust-1.85.1.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -319,7 +324,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -490,7 +495,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it diff --git a/dev-lang/rust/rust-1.86.0-r1.ebuild b/dev-lang/rust/rust-1.86.0-r1.ebuild index bf91ff5..0db82c9 100644 --- a/dev-lang/rust/rust-1.86.0-r1.ebuild +++ b/dev-lang/rust/rust-1.86.0-r1.ebuild @@ -94,7 +94,12 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) - lto? ( system-llvm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) ) + lto? ( system-llvm? ( + || ( + $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') + sys-devel/mold + ) + ) ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -124,6 +129,7 @@ RDEPEND="${DEPEND} dev-lang/rust-common sys-apps/lsb-release !dev-lang/rust:stable + !dev-lang/rust:1.86 !dev-lang/rust-bin:stable " @@ -319,7 +325,7 @@ src_prepare() { fi fi - if use lto && tc-is-clang && ! tc-ld-is-lld; then + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi @@ -490,7 +496,7 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) - $(if use lto && tc-is-clang ; then + $(if use lto && tc-is-clang && ! tc-ld-is-mold; then echo "use-lld = true" fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
