diff --git a/0001-add-support-for-ppc64le.patch b/0001-add-support-for-ppc64le.patch index dbd1e0e97ed8a9fe58a23c17b081013838bab71b..5a9db2bff60f5de6ab59550b595786ceebb75ea5 100644 --- a/0001-add-support-for-ppc64le.patch +++ b/0001-add-support-for-ppc64le.patch @@ -145,8 +145,8 @@ index 1264742..14427a7 100644 "s390x-unknown-linux-musl" => "linux64-s390x", diff --git a/vendor/target-lexicon-0.12.15/src/targets.rs b/vendor/target-lexicon-0.12.15/src/targets.rs index d14a7607b..f64e49568 100644 ---- a/vendor/target-lexicon-0.12.15/src/targets.rs -+++ b/vendor/target-lexicon-0.12.15/src/targets.rs +--- a/vendor/target-lexicon-0.12.16/src/targets.rs ++++ b/vendor/target-lexicon-0.12.16/src/targets.rs @@ -1692,6 +1692,9 @@ mod tests { "powerpc64le-unknown-freebsd", "powerpc64le-unknown-linux-gnu", diff --git a/rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz b/rust-1.83.0-aarch64-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz rename to rust-1.83.0-aarch64-unknown-linux-gnu.tar.xz index 5e0f13e21f96c61760f231e94a90bdfb625a8cfc..067525f7cb5bf00c2c84d9016321e7b47e0ad83b 100644 --- a/rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz +++ b/rust-1.83.0-aarch64-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99acf175be33bd96ac82d644125d0e2acc6962d61ee64851edc7d8ba3bd23ca4 -size 236675048 +oid sha256:5f02e00bca65f6eebafe2ac6b1bbdecb5f160f260a9c2231a51ed8d382f0ada0 +size 237502772 diff --git a/rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz b/rust-1.83.0-riscv64gc-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz rename to rust-1.83.0-riscv64gc-unknown-linux-gnu.tar.xz index 3c3cd4f2bf50138272fd00027b72f311ac901a65..a84d3491a3190d9d99b6c3eeffbeb6876d93ea1f 100644 --- a/rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz +++ b/rust-1.83.0-riscv64gc-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:532190c3cdbdee9249bcde648b1c61b092bdd8885266ba9edd6df6824a454958 -size 217304308 +oid sha256:ce9308beb0bb54560921821934625b9cdee01d8e6d269e252e9aaf630330b773 +size 218315040 diff --git a/rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz b/rust-1.83.0-x86_64-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz rename to rust-1.83.0-x86_64-unknown-linux-gnu.tar.xz index e92b3a3207c271cd5705a29645f79596ec1b77fd..b7ebdd4d5ee9041d5b234f84ceae53d3095ed79a 100644 --- a/rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz +++ b/rust-1.83.0-x86_64-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a6bf24ca1fee2bd861590431c7954674191a0c0dfa0af4169731bc1459cf58a -size 178075016 +oid sha256:b6467a0e8a6c5dca35269785c994e4d80d89754d6c600162cc9146f90c87ee08 +size 180329116 diff --git a/rust.spec b/rust.spec index ee1d4a9e43371b11c2c530fd3d229e137d2ff673..eede9a62440ff359ec91d622043ce6c9193d984a 100644 --- a/rust.spec +++ b/rust.spec @@ -1,8 +1,8 @@ %define _lto_cflags %{nil} -%global bootstrap_rust 1.82.0 -%global bootstrap_cargo 1.82.0 -%global bootstrap_channel 1.82.0 -%global bootstrap_date 2024-06-13 +%global bootstrap_rust 1.83.0 +%global bootstrap_cargo 1.83.0 +%global bootstrap_channel 1.83.0 +%global bootstrap_date 2024-11-28 %global bootstrap_arches x86_64 aarch64 riscv64 %bcond_with llvm_static %bcond_without bundled_llvm @@ -18,8 +18,8 @@ %endif Name: rust -Version: 1.82.0 -Release: 4 +Version: 1.83.0 +Release: 1 Summary: The Rust Programming Language License: Apache-2.0 OR MIT URL: https://www.rust-lang.org @@ -37,8 +37,6 @@ Patch0001: 0001-Use-lld-provided-by-system.patch # Set a substitute-path in rust-gdb for standard library sources. Patch0002: rustc-1.70.0-rust-gdb-substitute-path.patch Patch0003: 0001-add-support-for-ppc64le.patch -# https://github.com/rust-lang/rust/pull/130034 (from 1.83) -Patch0004: 0001-Fix-enabling-wasm-component-ld-to-match-other-tools.patch %{lua: function rust_triple(arch) local abi = "gnu" @@ -276,7 +274,6 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure %patch -P 0001 -p1 %patch -P 0002 -p1 %patch -P 0003 -p1 -%patch -P 0004 -p1 rm -rf vendor/curl-sys*/curl/ rm -rf vendor/jemalloc-sys/jemalloc/ rm -rf vendor/libffi-sys*/libffi/ @@ -465,7 +462,7 @@ export %{rust_env} %ifnarch loongarch64 %dir %{rustlibdir}/%{rust_musl_triple} %dir %{rustlibdir}/%{rust_musl_triple}/lib -%{rustlibdir}/%{rust_musl_triple}/lib/*.so +###%{rustlibdir}/%{rust_musl_triple}/lib/*.so %endif %files std-static diff --git a/rustc-1.82.0-src.tar.xz.asc b/rustc-1.82.0-src.tar.xz.asc deleted file mode 100644 index 3c1b0124fd01d7d3b074f3cf882dbb0fd38021f5..0000000000000000000000000000000000000000 --- a/rustc-1.82.0-src.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -wsFcBAABCgAQBQJnETfJCRCFq5bm+hvl/gAASrIP/R3fPIF8QTLm3MxtYYYESIUz -BbTUeC3NCuasXFLY7lPPazlgMTvtuRxn4qpTliwtGKtCDWtr1LdzwzFCw2zrW72g -wA/HHvpq16z3Qkk6kjW27c+QQVatAmBtpydehHo3V4QeMs1piMEbGT7cnyN/cW+u -o4YoBdfRMDKV13n516QhBDI7+LzF/Tz1P7RYYnXhSFQ4DwZZBdZni5udaELI8I2R -bhFwe0AC/msClq+Wo5u8I5qfmzUf4hj+zVCUeWt8srk434DkgEX+5lz4jkQH1WLv -HMZXyfx0xwynOe00teZKy6X8lD9KgF0EgbKEjntPbXlGiLWSRpFFvkPpz6DNQ0Hy -QiVqebi7skwO+SK/Go45SAnIH4y/nlMMx0RAtivDtk53VNU68wju5dXJ5KiWCWyc -vWZROmT5SdYFtaEGtiQyS4vhXKZ0mbTDX0LjxogLf+eW4wyRk91zzUxkpZ69SuSG -cR6AblMjvcjCfwgbSNkA4zg5V3OKs4WmuEyeO4Q/EMCO6+USjzwjqOB5L1NSFUkL -8z0qC70x68PR7d7mXgnqui4zISrYeXYe9nVRkwNwNFWFWBNUtW/LUGD/v6ee9CWD -0cYmInsUFM8DxtqJH0rsfd78qjrQwEtoReTrwO1fs9E5L3kCqZm5tNxp6A2vgCr/ -PIc5UHGVeUxQWc1bYNha -=IXFx ------END PGP SIGNATURE----- diff --git a/rustc-1.82.0-src.tar.xz b/rustc-1.83.0-src.tar.xz similarity index 32% rename from rustc-1.82.0-src.tar.xz rename to rustc-1.83.0-src.tar.xz index c83dcc00264eb4cb3ca9eb26421300f348823b0f..62e6a4fbc5168a5b41fe9a63ced0fd48720765d3 100644 --- a/rustc-1.82.0-src.tar.xz +++ b/rustc-1.83.0-src.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210 -size 219769328 +oid sha256:7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df +size 353808388 diff --git a/rustc-1.83.0-src.tar.xz.asc b/rustc-1.83.0-src.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..c4e662634c79cccd42ba878e1290b03937e03f80 --- /dev/null +++ b/rustc-1.83.0-src.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +wsFcBAABCgAQBQJnSHLqCRCFq5bm+hvl/gAAe54P/39kd/k6ZXxUwH115gHRGDbB +k4jBGolmSDNmapCOa0Or75ykRVvRUfuP9OLNRn4PbDx69g3TA3/Sw7LZ6kepwtnD +C0e+PP+CrRhc/5HJBGdl7WJUEwRciPV36gsuXQwSTfQiSj8z/70yAMjxBPT7e7Iv +YapeVEZ9DnlEdfURCOYgUNGupwe5NVqXLl5WTGzFXBlIRuQvYC6mAsgtP0XXw5ou +kMdXqOGtKlqbAw9oFr1nU9i2G5h5b3sEOtn1mlGSZTk191FTT4lCwWsoy967omhc +3JFt6j6JW1WymT9pN83TN+qBrWBws6hiJBi5W7Hkpd7GsTVMNSoExKkRDSw9lxtN +xFA4VoAl88JC6FZYQNoxZ2Xm86S5APLlNlaJDFGu1pErQmvk1nXaU8nY29zxo8J3 +TlmxGj4ksaqTa/qLyVmfAciHPJEKuhFdX7at9Ld25KV2DOOp4ZCsYC8a2kdlZi0q ++EnZUIZiFci1z/uYEZZCVEZ6QLPEyF6an4n4SPvu5yXtlYUFskKsrSIOT8Ln/QbC +cRY/mrIJV2z0lUQSrTg3BW0o1cCdqyZ2acUGuvjawYZkk0hk/UBYibW5vOkmg6aw +2vJhmjaWV5f+J24v2NsbMFOHlnybz6EBsvxjOA/l2UMgmzqeg0ZJWrjsk3EjBGtu +TJ1hlJjFE5rRYnVrf6ud +=tqIR +-----END PGP SIGNATURE-----