mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-16 18:01:09 +02:00
dev-lang/rust: Sync with Gentoo
It's from Gentoo commit 14c84a714e8d7871b5f5bd5afb80711d8a827389.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
e8a6263773
commit
880a5d0b95
@ -12,9 +12,10 @@ DIST rust-patches-1.84.0-r2.tar.bz2 2507 BLAKE2B ffe4e5fc49deebdb8b8b3022f951dfe
|
||||
DIST rust-patches-1.84.1-r2.tar.bz2 2982 BLAKE2B 2f7addfa4530f3eab79f55ea44eee6390970874ae5ed40ef8706224024db47c861326dc5a79ed9bffcffbad5b27d44b6a3aebab7987fdb61124be3083fbabd71 SHA512 cc852e1e679827390134b47bfaa68567a75a5e8559a3caa24ab3931955050bac59f4fe6a4c249d83bde0aa25667ea04749f3763ff3566daa2999df8cbf2d0981
|
||||
DIST rust-patches-1.85.0-r2.tar.bz2 4462 BLAKE2B 61cfde8688fecab1a5c3c80f29b37b691581f3f8be1648f9db34fff15026dab426458cba3b9f06fc5606a0a878b0527698ea6f94c7dff014e4339154ac907d13 SHA512 317ab0bcbb792faa1a761893264a29bd650b0d6c5ab17aa762075daccfda684bc6cdd20c0ef89b51bde1a7384fb1df576b18b5303115a8cf04877b435b2d6491
|
||||
DIST rust-patches-1.85.1-r1.tar.bz2 4473 BLAKE2B fad2fe3222e2625b5cbc60ea1fb805080ce70f751c930c0e3bde9cf043059e1fc3ba4d8e618166fe99a7fcf12d5cccb684c05d4c2542a89c9794869204cbcb09 SHA512 edf680a1d3a29ae5d8140031dc8b232b747d08494db2f3393ccc286d9197139583bcaf536d5125b8c896a610c075115b9a16a6e6f3f6b5da60e58433f000dba6
|
||||
DIST rust-patches-1.86.0-r2.tar.bz2 5980 BLAKE2B 179d6acc8c7006eac4d00e073ec1f5496756ef51d465bc098daf1cfe650f469f4341893c72a65e21d84ecb3ccaeb46f5204ef517ae942482d835f89c0a934391 SHA512 31e902661d5ee2da82858910551393890583d9702303fed5652122c852e9384fb88a42eddd0b968558865e16b5bd4ac2a13a35bd01ec3f8c3adbb673bc465596
|
||||
DIST rust-patches-1.87.0-r1.tar.bz2 4635 BLAKE2B d813ec4a602d3bb879927a44a0b9f752aac255e31dfd13c56ab71b3fae7ce46a742c1d2e7494a7e17728f1edb2327ddd6ad6ebabc0c47d66326b766bbd323fbd SHA512 596ffe744a5849b443f077bbd4edbcbb240b9ac51c9d53e0e436e46d7c93a6734477d22eba4a066a0cf474503a6357a72dfa124e594f645be6f50d9bd25bdb10
|
||||
DIST rust-patches-1.86.0-r2-1.tar.bz2 6308 BLAKE2B eca644026942bd729a748df57dd67465bbec96b2d18a71c58fe04bb8e2514aabb1ca02cbd3761be5283328a3b728e063b1b85ea78f4f242c182071c44b8cb148 SHA512 1f1edcf76c64b0555366253e21d759e904a752746c2e5d88aba6e31f5ee2a2b0b06275674d2fc3acc42f589905eddc006d788f95b48a5d79a6ab767251d934da
|
||||
DIST rust-patches-1.87.0-r1-1.tar.bz2 5116 BLAKE2B 783ad21464a7e393d0aee506119be12b0137a7d360402b74f36b6fde154c2804cc0779da63875977d09f7e9f2d273ff41dd189bbe4eb239a314fea27bbaa704c SHA512 8c67e4e43bf2afb226f70bb2a03aad0abfd525cd484c8c9ff663da06d63b471f4f1b48169d952a6a6c14258c0029dedea14aadaaca2ee75389df65b806188363
|
||||
DIST rust-patches-1.88.0.tar.bz2 4062 BLAKE2B 64168ffa608f2edf2e0b3d079152c3b5dd59d0cea29078894f286bf91488e2e7769c55ede2d43769368d2147b46699d1bf981190d6800dc3d41c736289122eaf SHA512 b565acfb4d1146e52b1fb66b4a242927407cc34f1b38c2a100135cbbde24c8374af1997bc22069cca25f33cc8d747e56391f3d98a2d4e13dc0abcec0d6f88b0b
|
||||
DIST rust-patches-1.89.0_beta20250726.tar.bz2 4126 BLAKE2B 643e6fda1f15d7b9e064d974929fbd97396edafd65f7eaaa3a7f0365e1929746deea800700022111e0e55a2f77a5153e90efd408b5398c34c15d81f2dc147625 SHA512 1021c1836d0a14f064a87e98b95d2a265ea0f8bdacb2cd0d7e08986d011371403faca4bf2d561e48bd089ba9f36aeff9f31f055dfeb9b613921b69eef329ee45
|
||||
DIST rustc-1.74.1-src.tar.xz 155968724 BLAKE2B e05f2379ac94b286f85791a138e1928e5b5b5a7749f0981d82c40c2a12860f55bf96bb2f0e924e35a0f8b2447b13052d38adea909aaa3199105787bb5a4861b3 SHA512 14c7e7ed2f38ab60299d8c7d41d78f042b6b57ef822d577b5138e60bdde31cf141eccd4332a25bc5da3d58eb5313d63c1448b5dfe9e11b8055bb8ea133a9038d
|
||||
DIST rustc-1.74.1-src.tar.xz.asc 801 BLAKE2B ddf73175b164233babf31ca3a381b03e20c0f36d017c1d5f85d6ab11f0986d861ab23b11c061e6b2444ced70c3d6a494cc3de4ec86f0deb221a805491bd75420 SHA512 9a96ff9ba9a4e2af4e267b2ec126fc0675c78d0eb767703daa2f28491c3d85c2ab00fbd8584390bf658812ec6c4ab6c57e43b386db59fd505bd3134a8873a09e
|
||||
DIST rustc-1.75.0-src.tar.xz 159624388 BLAKE2B 8937b80585eddaa3e1f1ef948899d14a170308518c6fef9fe569560cdd870053776956743f796055f2119399b9ca6c0df12fedd789ae46324d071e5126c4e495 SHA512 7b0f25d91b1b5c317980fc88e059200bd43b56a70b445fbc72fb9b96e09775bfd3a98e9bd9d662af80f0ce3aef527c777ee82777e96ca876f47a972d63da8606
|
||||
@ -49,3 +50,5 @@ DIST rustc-1.87.0-src.tar.xz 283604208 BLAKE2B 7ede723121ff8df3908674631ceaec757
|
||||
DIST rustc-1.87.0-src.tar.xz.asc 801 BLAKE2B c9740c03baedcd70defba3fd37831692adaf0e984ef6b11d259244330d044fcacf935e6dd76caf126848da0c40f38e5368c60e8aabed5d3c2655a61fdbdc7564 SHA512 ebc13374381839a997c63455b733fd2a7960b4fd497f19c29be948cce8bb59a31ddda5da54ca154c16f7de43dd1bacd6c6bd76f3b6b36c5b43f4cfaf1746b952
|
||||
DIST rustc-1.88.0-src.tar.xz 283294344 BLAKE2B fc17efbc8b2e54f2da61384097dcb3b8f595f27f7853f56cef034913f6b46a718113af0fe66f0e3b0afd184ec506b35f3b74172926cf727ddc061f567d54fa4c SHA512 e6c62af2953f49462b2369e9551b12f2bec114577f90e3e76049636da4279b1e7f4d53bc6896f5d0d4715d90ef6d29dacff529a45690ffac6af62ad64600db40
|
||||
DIST rustc-1.88.0-src.tar.xz.asc 801 BLAKE2B 858e987ad1fc49c1e1cbc5ea709f835c60fce907e89205e431c843bfad97dc0ccbcf399fc7d87319b8455561cbc24020bd88cb572cbe932cb8b80a8adec39687 SHA512 64ab398dc602fed3ad7bf232249e80cc0a9831aa90c7eb37658f7dc5b2af04ee391f9633aae7a1d90f743d019cec531318384f71384ecbe4f6169e6e88b7ba0e
|
||||
DIST rustc-1.89.0_beta20250726-src.tar.xz 267425764 BLAKE2B 2a6802d5458eedb66fa2bd28d1a0d4c2104b1a734d9f7ec35fe989d210496d09a6db1a655a99970d68cbaab395741e3ddab24999c1150e9e64e8e72e1e3d9912 SHA512 f1a7524f46675f574b22ec00d4ce0c42ae272be7265e0665bc81cf3803ce1b286e4f7eb64e1850a7aa7b7e05c1cecae7011ac43964138d3679c19f0008b27fc4
|
||||
DIST rustc-1.89.0_beta20250726-src.tar.xz.asc 801 BLAKE2B 9cac60bbe248e5c63e703549efed39cd66978d926ffda52c9578492194df8d7a592d16f606547039222ffb0baa375ac7bce98bda7a5388e4d03cffe8a25c4356 SHA512 49e2e90ee69155d2b28fa2e88a809fb2642ecde72618ce20bb3bbd56afa921fc1e228cdb6ef8bd22346cb5e106945df26a9b5b8acef8f3f8c343fed8694b95e8
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
diff '--color=auto' -Nuar rustc-1.86.0-src.orig/src/bootstrap/src/utils/helpers.rs rustc-1.86.0-src/src/bootstrap/src/utils/helpers.rs
|
||||
--- rustc-1.86.0-src.orig/src/bootstrap/src/utils/helpers.rs 2025-03-31 22:37:24.000000000 +0100
|
||||
+++ rustc-1.86.0-src/src/bootstrap/src/utils/helpers.rs 2025-04-17 12:31:37.651607535 +0100
|
||||
@@ -451,12 +451,12 @@
|
||||
if !builder.is_lld_direct_linker(target) && builder.config.lld_mode.is_used() {
|
||||
match builder.config.lld_mode {
|
||||
LldMode::External => {
|
||||
- args.push("-Clinker-flavor=gnu-lld-cc".to_string());
|
||||
+ args.push("-Zlinker-features=+lld".to_string());
|
||||
// FIXME(kobzol): remove this flag once MCP510 gets stabilized
|
||||
args.push("-Zunstable-options".to_string());
|
||||
}
|
||||
LldMode::SelfContained => {
|
||||
- args.push("-Clinker-flavor=gnu-lld-cc".to_string());
|
||||
+ args.push("-Zlinker-features=+lld".to_string());
|
||||
args.push("-Clink-self-contained=+linker".to_string());
|
||||
// FIXME(kobzol): remove this flag once MCP510 gets stabilized
|
||||
args.push("-Zunstable-options".to_string());
|
||||
@ -1,29 +0,0 @@
|
||||
From 76e13020767e7ff783284b5bcf7a7509259ceb51 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= <berykubik@gmail.com>
|
||||
Date: Fri, 4 Apr 2025 18:29:20 +0200
|
||||
Subject: [PATCH] Use target-agnostic LLD flags in bootstrap for use-lld
|
||||
|
||||
---
|
||||
src/bootstrap/src/utils/helpers.rs | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
|
||||
index f8e4d4e04717d..78dcdcbd1874a 100644
|
||||
--- a/src/bootstrap/src/utils/helpers.rs
|
||||
+++ b/src/bootstrap/src/utils/helpers.rs
|
||||
@@ -474,13 +474,13 @@ pub fn linker_flags(
|
||||
if stage == 0 && target.is_windows() {
|
||||
args.push("-Clink-arg=-fuse-ld=lld".to_string());
|
||||
} else {
|
||||
- args.push("-Clinker-flavor=gnu-lld-cc".to_string());
|
||||
+ args.push("-Zlinker-features=+lld".to_string());
|
||||
}
|
||||
// FIXME(kobzol): remove this flag once MCP510 gets stabilized
|
||||
args.push("-Zunstable-options".to_string());
|
||||
}
|
||||
LldMode::SelfContained => {
|
||||
- args.push("-Clinker-flavor=gnu-lld-cc".to_string());
|
||||
+ args.push("-Zlinker-features=+lld".to_string());
|
||||
args.push("-Clink-self-contained=+linker".to_string());
|
||||
// FIXME(kobzol): remove this flag once MCP510 gets stabilized
|
||||
args.push("-Zunstable-options".to_string());
|
||||
@ -264,6 +264,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -243,6 +243,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -243,6 +243,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -243,6 +243,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -243,6 +243,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -243,6 +243,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -243,6 +243,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -244,6 +244,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -243,6 +243,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -243,6 +243,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -249,6 +249,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -249,6 +249,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -306,6 +306,8 @@ src_prepare() {
|
||||
${CARGO} generate-lockfile --offline || die "Failed to generate lockfiles"
|
||||
fi
|
||||
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -306,6 +306,8 @@ src_prepare() {
|
||||
${CARGO} generate-lockfile --offline || die "Failed to generate lockfiles"
|
||||
fi
|
||||
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
@ -6,7 +6,7 @@ EAPI=8
|
||||
LLVM_COMPAT=( 19 )
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
|
||||
RUST_PATCH_VER=${PVR}
|
||||
RUST_PATCH_VER="${PVR}-1"
|
||||
|
||||
RUST_MAX_VER=${PV%%_*}
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
@ -307,6 +307,8 @@ src_prepare() {
|
||||
${CARGO} generate-lockfile --offline || die "Failed to generate lockfiles"
|
||||
fi
|
||||
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
@ -316,8 +318,6 @@ src_prepare() {
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
eapply "${FILESDIR}"/rust-1.86.0-issue-139372-bgo-953956-fix-hardcoded-gnu-linker-flags.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
|
||||
@ -6,7 +6,7 @@ EAPI=8
|
||||
LLVM_COMPAT=( 20 )
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
|
||||
RUST_PATCH_VER=${PVR}
|
||||
RUST_PATCH_VER="${PVR}-1"
|
||||
|
||||
RUST_MAX_VER=${PV%%_*}
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
@ -308,6 +308,8 @@ src_prepare() {
|
||||
${CARGO} generate-lockfile --offline || die "Failed to generate lockfiles"
|
||||
fi
|
||||
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
@ -317,8 +319,6 @@ src_prepare() {
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
eapply "${FILESDIR}"/rust-1.87.0-issue-139372-bgo-953956-fix-hardcoded-gnu-linker-flags.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
@ -446,6 +446,7 @@ src_configure() {
|
||||
cargo = "${rust_stage0_root}/bin/cargo"
|
||||
rustc = "${rust_stage0_root}/bin/rustc"
|
||||
rustfmt = "${rust_stage0_root}/bin/rustfmt"
|
||||
description = "gentoo"
|
||||
docs = $(toml_usex doc)
|
||||
compiler-docs = false
|
||||
submodules = false
|
||||
@ -483,7 +484,6 @@ src_configure() {
|
||||
echo "default-linker = \"${CHOST}-cc\""
|
||||
fi)
|
||||
channel = "${build_channel}"
|
||||
description = "gentoo"
|
||||
rpath = true
|
||||
verbose-tests = true
|
||||
optimize-tests = $(toml_usex !debug)
|
||||
|
||||
@ -320,6 +320,8 @@ src_prepare() {
|
||||
${CARGO} generate-lockfile --offline || die "Failed to generate lockfiles"
|
||||
fi
|
||||
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
@ -458,6 +460,7 @@ src_configure() {
|
||||
cargo = "${rust_stage0_root}/bin/cargo"
|
||||
rustc = "${rust_stage0_root}/bin/rustc"
|
||||
rustfmt = "${rust_stage0_root}/bin/rustfmt"
|
||||
description = "gentoo"
|
||||
docs = $(toml_usex doc)
|
||||
compiler-docs = false
|
||||
submodules = false
|
||||
@ -495,7 +498,6 @@ src_configure() {
|
||||
echo "default-linker = \"${CHOST}-cc\""
|
||||
fi)
|
||||
channel = "${build_channel}"
|
||||
description = "gentoo"
|
||||
rpath = true
|
||||
verbose-tests = true
|
||||
optimize-tests = $(toml_usex !debug)
|
||||
|
||||
837
sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.89.0_beta20250726.ebuild
vendored
Normal file
837
sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.89.0_beta20250726.ebuild
vendored
Normal file
@ -0,0 +1,837 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
LLVM_COMPAT=( 20 )
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
|
||||
RUST_PATCH_VER=${PVR}
|
||||
|
||||
RUST_MAX_VER=${PV%%_*}
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
RUST_MIN_VER="1.88.0" # Update this as new `beta` releases come out.
|
||||
elif [[ ${PV} == *beta* ]]; then
|
||||
RUST_MAX_VER="$(ver_cut 1).$(ver_cut 2).0"
|
||||
RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
|
||||
else
|
||||
RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
|
||||
fi
|
||||
|
||||
inherit check-reqs estack flag-o-matic llvm-r1 multiprocessing optfeature \
|
||||
multilib multilib-build python-any-r1 rust rust-toolchain toolchain-funcs verify-sig
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
inherit git-r3
|
||||
elif [[ ${PV} == *beta* ]]; then
|
||||
# Identify the snapshot date of the beta release:
|
||||
# curl -Ls static.rust-lang.org/dist/channel-rust-beta.toml | grep beta-src.tar.xz
|
||||
betaver=${PV//*beta}
|
||||
BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
|
||||
MY_P="rustc-beta"
|
||||
SRC_URI="https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz
|
||||
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${RUST_PATCH_VER}.tar.bz2
|
||||
verify-sig? ( https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc
|
||||
-> rustc-${PV}-src.tar.xz.asc )
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}-src"
|
||||
else
|
||||
MY_P="rustc-${PV}"
|
||||
SRC_URI="https://static.rust-lang.org/dist/${MY_P}-src.tar.xz
|
||||
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${RUST_PATCH_VER}.tar.bz2
|
||||
verify-sig? ( https://static.rust-lang.org/dist/${MY_P}-src.tar.xz.asc )
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}-src"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Systems programming language originally developed by Mozilla"
|
||||
HOMEPAGE="https://www.rust-lang.org/"
|
||||
|
||||
# keep in sync with llvm ebuild of the same version as bundled one.
|
||||
ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
|
||||
LoongArch M68k Mips MSP430 NVPTX PowerPC RISCV Sparc SPIRV SystemZ VE
|
||||
WebAssembly X86 XCore Xtensa )
|
||||
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
|
||||
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
|
||||
|
||||
# https://github.com/rust-lang/llvm-project/blob/rustc-1.84.0/llvm/CMakeLists.txt
|
||||
_ALL_RUST_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
|
||||
declare -A ALL_RUST_EXPERIMENTAL_TARGETS
|
||||
for _x in "${_ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do
|
||||
ALL_RUST_EXPERIMENTAL_TARGETS["llvm_targets_${_x}"]=0
|
||||
done
|
||||
|
||||
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
|
||||
SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual stable
|
||||
|
||||
IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto rustfmt rust-analyzer rust-src +system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# These USE flags require nightly rust
|
||||
IUSE+=" miri"
|
||||
fi
|
||||
|
||||
LLVM_DEPEND=()
|
||||
# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
|
||||
for _x in "${ALL_LLVM_TARGETS[@]}"; do
|
||||
LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}=]") )" )
|
||||
if [[ -v ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"] ]] ; then
|
||||
ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"]=1
|
||||
fi
|
||||
done
|
||||
LLVM_DEPEND+=( " wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
|
||||
LLVM_DEPEND+=( " $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
|
||||
|
||||
# dev-libs/oniguruma is used for documentation
|
||||
BDEPEND="${PYTHON_DEPS}
|
||||
app-eselect/eselect-rust
|
||||
dev-libs/oniguruma
|
||||
|| (
|
||||
>=sys-devel/gcc-4.7[cxx]
|
||||
>=llvm-core/clang-3.5
|
||||
)
|
||||
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
|
||||
)
|
||||
test? ( dev-debug/gdb )
|
||||
verify-sig? ( sec-keys/openpgp-keys-rust )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
>=app-arch/xz-utils-5.2
|
||||
net-misc/curl:=[http2,ssl]
|
||||
sys-libs/zlib:=
|
||||
dev-libs/openssl:0=
|
||||
system-llvm? (
|
||||
${LLVM_DEPEND[*]}
|
||||
llvm-libunwind? ( llvm-runtimes/libunwind:= )
|
||||
)
|
||||
!system-llvm? (
|
||||
!llvm-libunwind? (
|
||||
elibc_musl? ( sys-libs/libunwind:= )
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
app-eselect/eselect-rust
|
||||
dev-lang/rust-common
|
||||
sys-apps/lsb-release
|
||||
!dev-lang/rust:stable
|
||||
!dev-lang/rust-bin:stable
|
||||
"
|
||||
|
||||
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
|
||||
rust-analyzer? ( rust-src )
|
||||
test? ( ${ALL_LLVM_TARGETS[*]} )
|
||||
wasm? ( llvm_targets_WebAssembly )
|
||||
x86? ( cpu_flags_x86_sse2 )
|
||||
"
|
||||
|
||||
# we don't use cmake.eclass, but can get a warning
|
||||
CMAKE_WARN_UNUSED_CLI=no
|
||||
|
||||
QA_FLAGS_IGNORED="
|
||||
usr/lib/${PN}/${SLOT}/bin/.*
|
||||
usr/lib/${PN}/${SLOT}/libexec/.*
|
||||
usr/lib/${PN}/${SLOT}/lib/lib.*.so
|
||||
usr/lib/${PN}/${SLOT}/lib/rustlib/.*/bin/.*
|
||||
usr/lib/${PN}/${SLOT}/lib/rustlib/.*/lib/lib.*.so
|
||||
"
|
||||
|
||||
QA_SONAME="
|
||||
usr/lib/${PN}/${SLOT}/lib/lib.*.so.*
|
||||
usr/lib/${PN}/${SLOT}/lib/rustlib/.*/lib/lib.*.so
|
||||
"
|
||||
|
||||
QA_PRESTRIPPED="
|
||||
usr/lib/${PN}/${SLOT}/lib/rustlib/.*/bin/rust-llvm-dwp
|
||||
usr/lib/${PN}/${SLOT}/lib/rustlib/.*/lib/self-contained/crtn.o
|
||||
"
|
||||
|
||||
# An rmeta file is custom binary format that contains the metadata for the crate.
|
||||
# rmeta files do not support linking, since they do not contain compiled object files.
|
||||
# so we can safely silence the warning for this QA check.
|
||||
QA_EXECSTACK="usr/lib/${PN}/${SLOT}/lib/rustlib/*/lib*.rlib:lib.rmeta"
|
||||
|
||||
# causes double bootstrap
|
||||
RESTRICT="test"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc
|
||||
|
||||
clear_vendor_checksums() {
|
||||
sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die
|
||||
}
|
||||
|
||||
toml_usex() {
|
||||
usex "${1}" true false
|
||||
}
|
||||
|
||||
pre_build_checks() {
|
||||
local M=9216
|
||||
# multiply requirements by 1.3 if we are doing x86-multilib
|
||||
if use amd64; then
|
||||
M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 ))
|
||||
fi
|
||||
M=$(( $(usex clippy 128 0) + ${M} ))
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
M=$(( $(usex miri 128 0) + ${M} ))
|
||||
fi
|
||||
M=$(( $(usex rustfmt 256 0) + ${M} ))
|
||||
# add 2G if we compile llvm and 256M per llvm_target
|
||||
if ! use system-llvm; then
|
||||
M=$(( 2048 + ${M} ))
|
||||
local ltarget
|
||||
for ltarget in ${ALL_LLVM_TARGETS[@]}; do
|
||||
M=$(( $(usex ${ltarget} 256 0) + ${M} ))
|
||||
done
|
||||
fi
|
||||
M=$(( $(usex wasm 256 0) + ${M} ))
|
||||
M=$(( $(usex debug 2 1) * ${M} ))
|
||||
eshopts_push -s extglob
|
||||
if is-flagq '-g?(gdb)?([1-9])'; then
|
||||
M=$(( 15 * ${M} / 10 ))
|
||||
fi
|
||||
eshopts_pop
|
||||
M=$(( $(usex doc 256 0) + ${M} ))
|
||||
CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
|
||||
}
|
||||
|
||||
llvm_check_deps() {
|
||||
has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
|
||||
}
|
||||
|
||||
# Is LLVM being linked against libc++?
|
||||
is_libcxx_linked() {
|
||||
local code='#include <ciso646>
|
||||
#if defined(_LIBCPP_VERSION)
|
||||
HAVE_LIBCXX
|
||||
#endif
|
||||
'
|
||||
local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
|
||||
[[ ${out} == *HAVE_LIBCXX* ]]
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
pre_build_checks
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
pre_build_checks
|
||||
python-any-r1_pkg_setup
|
||||
|
||||
export LIBGIT2_NO_PKG_CONFIG=1 #749381
|
||||
if tc-is-cross-compiler; then
|
||||
use system-llvm && die "USE=system-llvm not allowed when cross-compiling"
|
||||
local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
|
||||
use "llvm_targets_${cross_llvm_target}" || \
|
||||
die "Must enable LLVM_TARGETS=${cross_llvm_target} matching CBUILD=${CBUILD} when cross-compiling"
|
||||
fi
|
||||
|
||||
rust_pkg_setup
|
||||
|
||||
if use system-llvm; then
|
||||
llvm-r1_pkg_setup
|
||||
|
||||
local llvm_config="$(get_llvm_prefix)/bin/llvm-config"
|
||||
export LLVM_LINK_SHARED=1
|
||||
export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
|
||||
fi
|
||||
}
|
||||
|
||||
rust_live_get_sources() {
|
||||
EGIT_REPO_URI="
|
||||
https://anongit.gentoo.org/git/proj/rust-patches.git
|
||||
"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR}/rust-patches-${RUST_PATCH_VER}"
|
||||
git-r3_src_unpack
|
||||
|
||||
EGIT_REPO_URI="
|
||||
https://github.com/rust-lang/rust.git
|
||||
"
|
||||
EGIT_SUBMODULES=(
|
||||
"*"
|
||||
"-src/gcc"
|
||||
)
|
||||
S="${WORKDIR}/rust"
|
||||
EGIT_CHECKOUT_DIR="${S}"
|
||||
git-r3_src_unpack
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == *9999* ]] ; then
|
||||
rust_live_get_sources
|
||||
|
||||
# Vendor dependencies
|
||||
mkdir "${S}/.cargo" || die # The vendor script has a check for .cargo/config{,.toml}
|
||||
touch "${S}/.cargo/bootstrap.toml" || die
|
||||
local rust_stage0_root="$(${RUSTC} --print sysroot || die "Can't determine rust's sysroot")"
|
||||
# Configure vendor to use the portage-provided toolchain. This prevents it from
|
||||
# attempting to fetch a `beta` toolchain from the internet.
|
||||
cat <<- _EOF_ > "${T}/vendor-bootstrap.toml"
|
||||
# Suppresses a warning about tracking changes which we don't care about.
|
||||
change-id = "ignore"
|
||||
[build]
|
||||
build = "$(rust_abi "${CBUILD}")"
|
||||
host = ["$(rust_abi "${CHOST}")"]
|
||||
target = ["$(rust_abi "${CHOST}")"]
|
||||
cargo = "${rust_stage0_root}/bin/cargo"
|
||||
rustc = "${rust_stage0_root}/bin/rustc"
|
||||
rustfmt = "${rust_stage0_root}/bin/rustfmt"
|
||||
_EOF_
|
||||
# We're using git sources so we need to run the Vendor script
|
||||
# to ensure that all dependencies are present and up-to-date
|
||||
mkdir "${S}/vendor" || die
|
||||
# This also compiles the 'build helper', there's no way to avoid this.
|
||||
${EPYTHON} "${S}"/x.py vendor -v --config="${T}"/vendor-bootstrap.toml -j$(makeopts_jobs) ||
|
||||
die "Failed to vendor dependencies"
|
||||
# TODO: This has to be generated somehow, this is from a 1.84.x tarball I had lying around.
|
||||
cat <<- _EOF_ > "${S}/.cargo/config.toml"
|
||||
[source.crates-io]
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."git+https://github.com/rust-lang/team"]
|
||||
git = "https://github.com/rust-lang/team"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source.vendored-sources]
|
||||
directory = "vendor"
|
||||
_EOF_
|
||||
elif use verify-sig ; then
|
||||
# Patch tarballs are not signed (but we trust Gentoo infra)
|
||||
verify-sig_verify_detached "${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
|
||||
default
|
||||
else
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# We need to update / generate lockfiles for the workspace
|
||||
${CARGO} generate-lockfile --offline || die "Failed to generate lockfiles"
|
||||
fi
|
||||
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
|
||||
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
|
||||
export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld"
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if tc-is-cross-compiler; then
|
||||
export PKG_CONFIG_ALLOW_CROSS=1
|
||||
export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
|
||||
export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
|
||||
export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
|
||||
fi
|
||||
|
||||
# Avoid bundled copies of libraries
|
||||
export RUSTONIG_SYSTEM_LIBONIG=1
|
||||
# Need to check if these can be optional
|
||||
#export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
|
||||
#export LIBSSH2_SYS_USE_PKG_CONFIG=1
|
||||
|
||||
filter-lto # https://bugs.gentoo.org/862109 https://bugs.gentoo.org/866231
|
||||
|
||||
local rust_target="" rust_targets="" arch_cflags
|
||||
|
||||
# Collect rust target names to compile standard libs for all ABIs.
|
||||
for v in $(multilib_get_enabled_abi_pairs); do
|
||||
rust_targets+=",\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
|
||||
done
|
||||
if use wasm; then
|
||||
rust_targets+=",\"wasm32-unknown-unknown\""
|
||||
if use system-llvm; then
|
||||
# un-hardcode rust-lld linker for this target
|
||||
# https://bugs.gentoo.org/715348
|
||||
sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/base/wasm.rs || die
|
||||
fi
|
||||
fi
|
||||
rust_targets="${rust_targets#,}"
|
||||
|
||||
# cargo and rustdoc are mandatory and should always be included
|
||||
local tools='"cargo","rustdoc"'
|
||||
use clippy && tools+=',"clippy"'
|
||||
use rustfmt && tools+=',"rustfmt"'
|
||||
use rust-analyzer && tools+=',"rust-analyzer","rust-analyzer-proc-macro-srv"'
|
||||
use rust-src && tools+=',"src"'
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
use miri && tools+=',"miri"'
|
||||
fi
|
||||
|
||||
local rust_stage0_root="$(${RUSTC} --print sysroot || die "Can't determine rust's sysroot")"
|
||||
# in case of prefix it will be already prefixed, as --print sysroot returns full path
|
||||
[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
|
||||
|
||||
rust_target="$(rust_abi)"
|
||||
rust_build="$(rust_abi "${CBUILD}")"
|
||||
rust_host="$(rust_abi "${CHOST}")"
|
||||
|
||||
RUST_EXPERIMENTAL_TARGETS=()
|
||||
for _x in "${!ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do
|
||||
if [[ ${ALL_RUST_EXPERIMENTAL_TARGETS[${_x}]} == 1 ]] && use ${_x} ; then
|
||||
RUST_EXPERIMENTAL_TARGETS+=( ${_x#llvm_targets_} )
|
||||
fi
|
||||
done
|
||||
RUST_EXPERIMENTAL_TARGETS=${RUST_EXPERIMENTAL_TARGETS[@]}
|
||||
|
||||
local cm_btype="$(usex debug DEBUG RELEASE)"
|
||||
local build_channel
|
||||
local build_miri="false"
|
||||
case "${PV}" in
|
||||
*9999*)
|
||||
build_channel="nightly"
|
||||
;;
|
||||
*beta*)
|
||||
build_channel="beta"
|
||||
;;
|
||||
*)
|
||||
build_channel="stable"
|
||||
;;
|
||||
esac
|
||||
cat <<- _EOF_ > "${S}"/bootstrap.toml
|
||||
# Suppresses a warning about tracking changes which we don't care about.
|
||||
change-id = "ignore"
|
||||
# https://github.com/rust-lang/rust/issues/135358 (bug #947897)
|
||||
profile = "dist"
|
||||
[llvm]
|
||||
download-ci-llvm = false
|
||||
optimize = $(toml_usex !debug)
|
||||
release-debuginfo = $(toml_usex debug)
|
||||
assertions = $(toml_usex debug)
|
||||
ninja = true
|
||||
targets = "${LLVM_TARGETS// /;}"
|
||||
experimental-targets = "${RUST_EXPERIMENTAL_TARGETS// /;}"
|
||||
link-shared = $(toml_usex system-llvm)
|
||||
$(if is_libcxx_linked; then
|
||||
# https://bugs.gentoo.org/732632
|
||||
echo "use-libcxx = true"
|
||||
echo "static-libstdcpp = false"
|
||||
fi)
|
||||
$(case "${rust_target}" in
|
||||
i586-*-linux-*)
|
||||
# https://github.com/rust-lang/rust/issues/93059
|
||||
echo 'cflags = "-fcf-protection=none"'
|
||||
echo 'cxxflags = "-fcf-protection=none"'
|
||||
echo 'ldflags = "-fcf-protection=none"'
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac)
|
||||
enable-warnings = false
|
||||
[llvm.build-config]
|
||||
CMAKE_VERBOSE_MAKEFILE = "ON"
|
||||
$(if ! tc-is-cross-compiler; then
|
||||
# When cross-compiling, LLVM is compiled twice, once for host and
|
||||
# once for target. Unfortunately, this build configuration applies
|
||||
# to both, which means any flags applicable to one target but not
|
||||
# the other will break. Conditionally disable respecting user
|
||||
# flags when cross-compiling.
|
||||
echo "CMAKE_C_FLAGS_${cm_btype} = \"${CFLAGS}\""
|
||||
echo "CMAKE_CXX_FLAGS_${cm_btype} = \"${CXXFLAGS}\""
|
||||
echo "CMAKE_EXE_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
|
||||
echo "CMAKE_MODULE_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
|
||||
echo "CMAKE_SHARED_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
|
||||
echo "CMAKE_STATIC_LINKER_FLAGS_${cm_btype} = \"${ARFLAGS}\""
|
||||
fi)
|
||||
[build]
|
||||
build-stage = 2
|
||||
test-stage = 2
|
||||
build = "${rust_build}"
|
||||
host = ["${rust_host}"]
|
||||
target = [${rust_targets}]
|
||||
cargo = "${rust_stage0_root}/bin/cargo"
|
||||
rustc = "${rust_stage0_root}/bin/rustc"
|
||||
rustfmt = "${rust_stage0_root}/bin/rustfmt"
|
||||
description = "gentoo"
|
||||
docs = $(toml_usex doc)
|
||||
compiler-docs = false
|
||||
submodules = false
|
||||
python = "${EPYTHON}"
|
||||
locked-deps = true
|
||||
vendor = true
|
||||
extended = true
|
||||
tools = [${tools}]
|
||||
verbose = 2
|
||||
sanitizers = false
|
||||
profiler = true
|
||||
cargo-native-static = false
|
||||
[install]
|
||||
prefix = "${EPREFIX}/usr/lib/${PN}/${SLOT}"
|
||||
sysconfdir = "etc"
|
||||
docdir = "share/doc/rust"
|
||||
bindir = "bin"
|
||||
libdir = "lib"
|
||||
mandir = "share/man"
|
||||
[rust]
|
||||
# https://github.com/rust-lang/rust/issues/54872
|
||||
codegen-units-std = 1
|
||||
optimize = true
|
||||
debug = $(toml_usex debug)
|
||||
debug-assertions = $(toml_usex debug)
|
||||
debug-assertions-std = $(toml_usex debug)
|
||||
debuginfo-level = $(usex debug 2 0)
|
||||
debuginfo-level-rustc = $(usex debug 2 0)
|
||||
debuginfo-level-std = $(usex debug 2 0)
|
||||
debuginfo-level-tools = $(usex debug 2 0)
|
||||
debuginfo-level-tests = 0
|
||||
backtrace = true
|
||||
incremental = false
|
||||
$(if ! tc-is-cross-compiler; then
|
||||
echo "default-linker = \"${CHOST}-cc\""
|
||||
fi)
|
||||
channel = "${build_channel}"
|
||||
rpath = true
|
||||
verbose-tests = true
|
||||
optimize-tests = $(toml_usex !debug)
|
||||
codegen-tests = true
|
||||
omit-git-hash = false
|
||||
dist-src = false
|
||||
remap-debuginfo = true
|
||||
lld = $(usex system-llvm false $(toml_usex wasm))
|
||||
$(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
|
||||
# https://github.com/rust-lang/rust/issues/74976
|
||||
# https://github.com/rust-lang/rust/issues/76526
|
||||
deny-warnings = $(usex wasm $(usex doc false true) true)
|
||||
backtrace-on-ice = true
|
||||
jemalloc = false
|
||||
# See https://github.com/rust-lang/rust/issues/121124
|
||||
lto = "$(usex lto thin off)"
|
||||
[dist]
|
||||
src-tarball = false
|
||||
compression-formats = ["xz"]
|
||||
compression-profile = "balanced"
|
||||
_EOF_
|
||||
|
||||
for v in $(multilib_get_enabled_abi_pairs); do
|
||||
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
|
||||
arch_cflags="$(get_abi_CFLAGS ${v##*.})"
|
||||
|
||||
export CFLAGS_${rust_target//-/_}="${arch_cflags}"
|
||||
|
||||
cat <<- _EOF_ >> "${S}"/bootstrap.toml
|
||||
[target.${rust_target}]
|
||||
ar = "$(tc-getAR)"
|
||||
cc = "$(tc-getCC)"
|
||||
cxx = "$(tc-getCXX)"
|
||||
linker = "$(tc-getCC)"
|
||||
ranlib = "$(tc-getRANLIB)"
|
||||
llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
|
||||
_EOF_
|
||||
if use system-llvm; then
|
||||
cat <<- _EOF_ >> "${S}"/bootstrap.toml
|
||||
llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
|
||||
_EOF_
|
||||
fi
|
||||
# by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
|
||||
# but we patch it and set to false here as well
|
||||
if use elibc_musl; then
|
||||
cat <<- _EOF_ >> "${S}"/bootstrap.toml
|
||||
crt-static = false
|
||||
musl-root = "$($(tc-getCC) -print-sysroot)/usr"
|
||||
_EOF_
|
||||
fi
|
||||
done
|
||||
if use wasm; then
|
||||
wasm_target="wasm32-unknown-unknown"
|
||||
export CFLAGS_${wasm_target//-/_}="$(filter-flags '-mcpu*' '-march*' '-mtune*'; echo "$CFLAGS")"
|
||||
cat <<- _EOF_ >> "${S}"/bootstrap.toml
|
||||
[target.wasm32-unknown-unknown]
|
||||
linker = "$(usex system-llvm lld rust-lld)"
|
||||
# wasm target does not have profiler_builtins https://bugs.gentoo.org/848483
|
||||
profiler = false
|
||||
_EOF_
|
||||
fi
|
||||
|
||||
if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
|
||||
# experimental cross support
|
||||
# discussion: https://bugs.gentoo.org/679878
|
||||
# TODO: c*flags, clang, system-llvm, cargo.eclass target support
|
||||
# it would be much better if we could split out stdlib
|
||||
# complilation to separate ebuild and abuse CATEGORY to
|
||||
# just install to /usr/lib/rustlib/<target>
|
||||
|
||||
# extra targets defined as a bash array
|
||||
# spec format: <LLVM target>:<rust-target>:<CTARGET>
|
||||
# best place would be /etc/portage/env/dev-lang/rust
|
||||
# Example:
|
||||
# RUST_CROSS_TARGETS=(
|
||||
# "AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
|
||||
# )
|
||||
# no extra hand holding is done, no target transformations, all
|
||||
# values are passed as-is with just basic checks, so it's up to user to supply correct values
|
||||
# valid rust targets can be obtained with
|
||||
# rustc --print target-list
|
||||
# matching cross toolchain has to be installed
|
||||
# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
|
||||
# only gcc toolchains installed with crossdev are checked for now.
|
||||
|
||||
# BUG: we can't pass host flags to cross compiler, so just filter for now
|
||||
# BUG: this should be more fine-grained.
|
||||
filter-flags '-mcpu=*' '-march=*' '-mtune=*'
|
||||
|
||||
local cross_target_spec
|
||||
for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
|
||||
# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
|
||||
local cross_llvm_target="${cross_target_spec%%:*}"
|
||||
# extracts toolchain triples, <rust-target>:<CTARGET>
|
||||
local cross_triples="${cross_target_spec#*:}"
|
||||
# extracts first element after before : separator
|
||||
local cross_rust_target="${cross_triples%%:*}"
|
||||
# extracts last element after : separator
|
||||
local cross_toolchain="${cross_triples##*:}"
|
||||
use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
|
||||
command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
|
||||
|
||||
cat <<- _EOF_ >> "${S}"/bootstrap.toml
|
||||
[target.${cross_rust_target}]
|
||||
ar = "${cross_toolchain}-ar"
|
||||
cc = "${cross_toolchain}-gcc"
|
||||
cxx = "${cross_toolchain}-g++"
|
||||
linker = "${cross_toolchain}-gcc"
|
||||
ranlib = "${cross_toolchain}-ranlib"
|
||||
_EOF_
|
||||
if use system-llvm; then
|
||||
cat <<- _EOF_ >> "${S}"/bootstrap.toml
|
||||
llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
|
||||
_EOF_
|
||||
fi
|
||||
if [[ "${cross_toolchain}" == *-musl* ]]; then
|
||||
cat <<- _EOF_ >> "${S}"/bootstrap.toml
|
||||
musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
|
||||
_EOF_
|
||||
fi
|
||||
|
||||
# append cross target to "normal" target list
|
||||
# example 'target = ["powerpc64le-unknown-linux-gnu"]'
|
||||
# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
|
||||
|
||||
rust_targets="${rust_targets},\"${cross_rust_target}\""
|
||||
sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" bootstrap.toml || die
|
||||
|
||||
ewarn
|
||||
ewarn "Enabled ${cross_rust_target} rust target"
|
||||
ewarn "Using ${cross_toolchain} cross toolchain"
|
||||
ewarn
|
||||
if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
|
||||
ewarn "'sys-devel/binutils[multitarget]' is not installed"
|
||||
ewarn "'strip' will be unable to strip cross libraries"
|
||||
ewarn "cross targets will be installed with full debug information"
|
||||
ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
|
||||
ewarn
|
||||
ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
|
||||
ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
|
||||
ewarn
|
||||
fi
|
||||
done
|
||||
fi # I_KNOW_WHAT_I_AM_DOING_CROSS
|
||||
|
||||
einfo "Rust configured with the following flags:"
|
||||
echo
|
||||
echo RUSTFLAGS="\"${RUSTFLAGS}\""
|
||||
echo RUSTFLAGS_BOOTSTRAP="\"${RUSTFLAGS_BOOTSTRAP}\""
|
||||
echo RUSTFLAGS_NOT_BOOTSTRAP="\"${RUSTFLAGS_NOT_BOOTSTRAP}\""
|
||||
echo MAGIC_EXTRA_RUSTFLAGS="\"${MAGIC_EXTRA_RUSTFLAGS}\""
|
||||
env | grep "CARGO_TARGET_.*_RUSTFLAGS="
|
||||
env | grep "CFLAGS_.*"
|
||||
echo
|
||||
einfo "bootstrap.toml contents:"
|
||||
cat "${S}"/bootstrap.toml || die
|
||||
echo
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# -v will show invocations, -vv "very verbose" is overkill, -vvv "very very verbose" is insane
|
||||
RUST_BACKTRACE=1 "${EPYTHON}" ./x.py build -v --config="${S}"/bootstrap.toml -j$(makeopts_jobs) || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# https://rustc-dev-guide.rust-lang.org/tests/intro.html
|
||||
|
||||
# those are basic and codegen tests.
|
||||
local tests=(
|
||||
codegen
|
||||
codegen-units
|
||||
compile-fail
|
||||
incremental
|
||||
mir-opt
|
||||
pretty
|
||||
run-make
|
||||
)
|
||||
|
||||
# fails if llvm is not built with ALL targets.
|
||||
# and known to fail with system llvm sometimes.
|
||||
use system-llvm || tests+=( assembly )
|
||||
|
||||
# fragile/expensive/less important tests
|
||||
# or tests that require extra builds
|
||||
# TODO: instead of skipping, just make some nonfatal.
|
||||
if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
|
||||
tests+=(
|
||||
rustdoc
|
||||
rustdoc-js
|
||||
rustdoc-js-std
|
||||
rustdoc-ui
|
||||
run-make-fulldeps
|
||||
ui
|
||||
ui-fulldeps
|
||||
)
|
||||
fi
|
||||
|
||||
local i failed=()
|
||||
einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
|
||||
for i in "${tests[@]}"; do
|
||||
local t="src/test/${i}"
|
||||
einfo "rust_src_test: running ${t}"
|
||||
if ! RUST_BACKTRACE=1 "${EPYTHON}" ./x.py test -vv --config="${S}"/bootstrap.toml \
|
||||
-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
|
||||
then
|
||||
failed+=( "${t}" )
|
||||
eerror "rust_src_test: ${t} failed"
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ ${#failed[@]} -ne 0 ]]; then
|
||||
eerror "rust_src_test: failure summary: ${failed[@]}"
|
||||
die "aborting due to test failures"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DESTDIR="${D}" "${EPYTHON}" ./x.py install -v --config="${S}"/bootstrap.toml -j$(makeopts_jobs) || die
|
||||
|
||||
docompress /usr/lib/${PN}/${SLOT}/share/man/
|
||||
|
||||
# bug #689562, #689160
|
||||
rm -v "${ED}/usr/lib/${PN}/${SLOT}/etc/bash_completion.d/cargo" || die
|
||||
rmdir -v "${ED}/usr/lib/${PN}/${SLOT}"/etc{/bash_completion.d,} || die
|
||||
|
||||
local symlinks=(
|
||||
cargo
|
||||
rustc
|
||||
rustdoc
|
||||
rust-gdb
|
||||
rust-gdbgui
|
||||
rust-lldb
|
||||
)
|
||||
|
||||
use clippy && symlinks+=( clippy-driver cargo-clippy )
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
use miri && symlinks+=( miri cargo-miri )
|
||||
fi
|
||||
use rustfmt && symlinks+=( rustfmt cargo-fmt )
|
||||
use rust-analyzer && symlinks+=( rust-analyzer )
|
||||
|
||||
einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
|
||||
local i
|
||||
for i in "${symlinks[@]}"; do
|
||||
# we need realpath on /usr/bin/* symlink return version-appended binary path.
|
||||
# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
|
||||
# need to fix eselect-rust to remove this hack.
|
||||
local ver_i="${i}-${PV%%_*}"
|
||||
if [[ -f "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}" ]]; then
|
||||
einfo "Installing ${i} symlink"
|
||||
ln -v "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}" "${ED}/usr/lib/${PN}/${SLOT}/bin/${ver_i}" || die
|
||||
else
|
||||
ewarn "${i} symlink requested, but source file not found"
|
||||
ewarn "please report this"
|
||||
fi
|
||||
dosym "../lib/${PN}/${SLOT}/bin/${ver_i}" "/usr/bin/${ver_i}"
|
||||
done
|
||||
|
||||
# symlinks to switch components to active rust in eselect
|
||||
dosym "${SLOT}/lib" "/usr/lib/${PN}/lib-${SLOT}"
|
||||
use rust-analyzer && dosym "${SLOT}/libexec" "/usr/lib/${PN}/libexec-${SLOT}"
|
||||
dosym "${SLOT}/share/man" "/usr/lib/${PN}/man-${SLOT}"
|
||||
dosym "rust/${SLOT}/lib/rustlib" "/usr/lib/rustlib-${SLOT}"
|
||||
dosym "../../lib/${PN}/${SLOT}/share/doc/rust" "/usr/share/doc/${P}"
|
||||
|
||||
newenvd - "50${P}" <<-_EOF_
|
||||
MANPATH="${EPREFIX}/usr/lib/rust/man-${SLOT}"
|
||||
_EOF_
|
||||
|
||||
rm -rf "${ED}/usr/lib/${PN}/${SLOT}"/*.old || die
|
||||
rm -rf "${ED}/usr/lib/${PN}/${SLOT}/bin"/*.old || die
|
||||
rm -rf "${ED}/usr/lib/${PN}/${SLOT}/doc"/*.old || die
|
||||
|
||||
# note: eselect-rust adds EROOT to all paths below
|
||||
cat <<-_EOF_ > "${T}/provider-${PN}-${SLOT}"
|
||||
/usr/bin/cargo
|
||||
/usr/bin/rustdoc
|
||||
/usr/bin/rust-gdb
|
||||
/usr/bin/rust-gdbgui
|
||||
/usr/bin/rust-lldb
|
||||
/usr/lib/rustlib
|
||||
/usr/lib/rust/lib
|
||||
/usr/lib/rust/man
|
||||
/usr/share/doc/rust
|
||||
_EOF_
|
||||
|
||||
if use clippy; then
|
||||
echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
|
||||
echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
|
||||
fi
|
||||
if [[ ${SLOT} == *9999* ]] && use miri; then
|
||||
echo /usr/bin/miri >> "${T}/provider-${P}"
|
||||
echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
|
||||
fi
|
||||
if use rustfmt; then
|
||||
echo /usr/bin/rustfmt >> "${T}/provider-${P}"
|
||||
echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
|
||||
fi
|
||||
if use rust-analyzer; then
|
||||
echo /usr/lib/rust/libexec >> "${T}/provider-${P}"
|
||||
echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
|
||||
fi
|
||||
|
||||
insinto /etc/env.d/rust
|
||||
doins "${T}/provider-${PN}-${SLOT}"
|
||||
|
||||
if use dist; then
|
||||
"${EPYTHON}" ./x.py dist -v --config="${S}"/bootstrap.toml -j$(makeopts_jobs) || die
|
||||
insinto "/usr/lib/${PN}/${SLOT}/dist"
|
||||
doins -r "${S}/build/dist/."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
||||
eselect rust update
|
||||
|
||||
if has_version dev-debug/gdb || has_version llvm-core/lldb; then
|
||||
elog "Rust installs helper scripts for calling GDB and LLDB,"
|
||||
elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
|
||||
fi
|
||||
|
||||
if has_version app-editors/emacs; then
|
||||
optfeature "emacs support for rust" app-emacs/rust-mode
|
||||
fi
|
||||
|
||||
if has_version app-editors/gvim || has_version app-editors/vim; then
|
||||
optfeature "vim support for rust" app-vim/rust-vim
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect rust cleanup
|
||||
}
|
||||
@ -10,7 +10,7 @@ RUST_PATCH_VER=${PVR}
|
||||
|
||||
RUST_MAX_VER=${PV%%_*}
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
RUST_MIN_VER="1.88.0" # Update this as new `beta` releases come out.
|
||||
RUST_MIN_VER="1.89.0" # Update this as new `beta` releases come out.
|
||||
elif [[ ${PV} == *beta* ]]; then
|
||||
RUST_MAX_VER="$(ver_cut 1).$(ver_cut 2).0"
|
||||
RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
|
||||
@ -320,6 +320,8 @@ src_prepare() {
|
||||
${CARGO} generate-lockfile --offline || die "Failed to generate lockfiles"
|
||||
fi
|
||||
|
||||
# Commit patches to the appropriate branch in proj/rust-patches.git
|
||||
# then cut a new tag / tarball. Don't add patches to ${FILESDIR}
|
||||
PATCHES=(
|
||||
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
|
||||
)
|
||||
@ -458,6 +460,7 @@ src_configure() {
|
||||
cargo = "${rust_stage0_root}/bin/cargo"
|
||||
rustc = "${rust_stage0_root}/bin/rustc"
|
||||
rustfmt = "${rust_stage0_root}/bin/rustfmt"
|
||||
description = "gentoo"
|
||||
docs = $(toml_usex doc)
|
||||
compiler-docs = false
|
||||
submodules = false
|
||||
@ -495,7 +498,6 @@ src_configure() {
|
||||
echo "default-linker = \"${CHOST}-cc\""
|
||||
fi)
|
||||
channel = "${build_channel}"
|
||||
description = "gentoo"
|
||||
rpath = true
|
||||
verbose-tests = true
|
||||
optimize-tests = $(toml_usex !debug)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user