sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lang/rust: Update to 1.83.0

Browse source 
Announce:	https://blog.rust-lang.org/2024/11/28/Rust-1.83.0.html
ChangeLog:	https://github.com/rust-lang/rust/releases/tag/1.83.0

PR:		283000
Tested by:	mikael,pkubaj,vishwin
This commit is contained in:
Mikael Urankar 2024-11-26 21:18:54 +01:00
parent 5dd70ed34a
commit 9474c17fbe
8 changed files with 112 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/Uses/cargo.mk
View file

@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc}
CARGO_BUILDDEP?= yes
. if ${CARGO_BUILDDEP:tl} == "yes"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.82.0:lang/${RUST_DEFAULT}
BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.83.0:lang/${RUST_DEFAULT}
. elif ${CARGO_BUILDDEP:tl} == "any-version"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
. endif

2
Mk/bsd.gecko.mk
View file

@ -77,7 +77,7 @@ ELF_FEATURES+= +wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin
BUNDLE_LIBS= yes
BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \
${RUST_DEFAULT}>=1.82.0:lang/${RUST_DEFAULT} \
${RUST_DEFAULT}>=1.83.0:lang/${RUST_DEFAULT} \
node:www/node
LIB_DEPENDS+= libdrm.so:graphics/libdrm
RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci

3
lang/rust-bootstrap/Makefile
View file

@ -2,7 +2,7 @@
# to upload them to ~/public_distfiles on freefall in preparation
# for the next lang/rust update.
PORTNAME= rust
PORTVERSION= 1.82.0
PORTVERSION= 1.83.0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/
PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-
@ -98,6 +98,7 @@ do-configure:
@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml
@${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'download-ci-llvm=false' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'link-shared=false' >> ${WRKSRC}/config.toml
.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
@${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml

6
lang/rust-bootstrap/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1729451664
SHA256 (rust/rustc-1.82.0-src.tar.xz) = 1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210
SIZE (rust/rustc-1.82.0-src.tar.xz) = 219769328
TIMESTAMP = 1732649274
SHA256 (rust/rustc-1.83.0-src.tar.xz) = 7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
SIZE (rust/rustc-1.83.0-src.tar.xz) = 353808388

12
lang/rust/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= rust
PORTVERSION?= 1.82.0
PORTREVISION?= 1
PORTVERSION?= 1.83.0
PORTREVISION?= 0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/:src \
https://dev-static.rust-lang.org/dist/:src \
@ -64,7 +64,7 @@ DOCS_VARS= _RUST_BUILD_DOCS=true \
_RUST_TOOLS+=rustdoc
DOCS_VARS_OFF= _RUST_BUILD_DOCS=false
GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb
PORT_LLVM_USES= llvm:min=17,lib,noexport
PORT_LLVM_USES= llvm:min=18,lib,noexport
PORT_LLVM_MAKE_ENV= RUSTFLAGS="-Lnative=${LOCALBASE}/lib"
SOURCES_VARS= _COMPONENTS+=rust-src-${_PACKAGE_VERS} \
_RUST_TOOLS+=src
@ -72,8 +72,8 @@ WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
_RUST_TARGETS+=wasm32-unknown-unknown
# See WRKSRC/src/stage0 for the date and version values
BOOTSTRAPS_DATE?= 2024-09-05
RUST_BOOTSTRAP_VERSION?= 1.81.0
BOOTSTRAPS_DATE?= 2024-10-17
RUST_BOOTSTRAP_VERSION?= 1.82.0
CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
@ -198,9 +198,7 @@ do-configure:
.endif
@${ECHO_CMD} 'remap-debuginfo=true' >> ${WRKSRC}/config.toml
@${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml
.if defined(NIGHTLY_DATE)
@${ECHO_CMD} 'download-ci-llvm = false' >> ${WRKSRC}/config.toml
.endif
.if ${PORT_OPTIONS:MLTO}
@${ECHO_CMD} 'thin-lto=true' >> ${WRKSRC}/config.toml
.endif

90
lang/rust/distinfo
View file

@ -1,51 +1,51 @@
TIMESTAMP = 1731596358
SHA256 (rust/rustc-1.82.0-src.tar.xz) = 1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210
SIZE (rust/rustc-1.82.0-src.tar.xz) = 219769328
SHA256 (rust/2024-09-05/rustc-1.81.0-aarch64-unknown-freebsd.tar.xz) = 721beae8927fc82313d397ce8de7f11a298d3f966344943dae98605a4042758c
SIZE (rust/2024-09-05/rustc-1.81.0-aarch64-unknown-freebsd.tar.xz) = 61258492
SHA256 (rust/2024-09-05/rust-std-1.81.0-aarch64-unknown-freebsd.tar.xz) = 4d3a685ea57f94ab78d35da7bc8290a7a21eac70a6b23240d058ce9e5934af50
SIZE (rust/2024-09-05/rust-std-1.81.0-aarch64-unknown-freebsd.tar.xz) = 26107012
SHA256 (rust/2024-09-05/cargo-1.81.0-aarch64-unknown-freebsd.tar.xz) = a213e3470c9d4c4b867657be419c47db6f34047837b0fbcc4e18fa7add181dbf
SIZE (rust/2024-09-05/cargo-1.81.0-aarch64-unknown-freebsd.tar.xz) = 9206832
SHA256 (rust/2024-09-05/rustc-1.81.0-x86_64-unknown-freebsd.tar.xz) = a1875f80c608dc5e7cf431d782512b36753c7b8a8a7e68b2828542a1b15f4797
SIZE (rust/2024-09-05/rustc-1.81.0-x86_64-unknown-freebsd.tar.xz) = 50002544
SHA256 (rust/2024-09-05/rust-std-1.81.0-x86_64-unknown-freebsd.tar.xz) = dd34a1f363e4f36e8814520cd19cb41b8dea4991bf58effa28b68bed5309aa6f
SIZE (rust/2024-09-05/rust-std-1.81.0-x86_64-unknown-freebsd.tar.xz) = 26944964
SHA256 (rust/2024-09-05/cargo-1.81.0-x86_64-unknown-freebsd.tar.xz) = 0e2578c6d00860bcfcb7f7f55a85a162d98538c8c4ad856cfa0fe8cacf64a564
SIZE (rust/2024-09-05/cargo-1.81.0-x86_64-unknown-freebsd.tar.xz) = 10321608
TIMESTAMP = 1732649272
SHA256 (rust/rustc-1.83.0-src.tar.xz) = 7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
SIZE (rust/rustc-1.83.0-src.tar.xz) = 353808388
SHA256 (rust/2024-10-17/rustc-1.82.0-aarch64-unknown-freebsd.tar.xz) = 2a758f72d6bbb983193dea7d24e6e5fc3811b63f472c6c58f32197af940aa795
SIZE (rust/2024-10-17/rustc-1.82.0-aarch64-unknown-freebsd.tar.xz) = 62711948
SHA256 (rust/2024-10-17/rust-std-1.82.0-aarch64-unknown-freebsd.tar.xz) = 2ec9beef0b6e222f10c69e40229b00785e484726f15f190872bba92ad05b9356
SIZE (rust/2024-10-17/rust-std-1.82.0-aarch64-unknown-freebsd.tar.xz) = 26423576
SHA256 (rust/2024-10-17/cargo-1.82.0-aarch64-unknown-freebsd.tar.xz) = 1493b5ff965b59876dba00a192daf89f74f4ee6686cd89ea878ac86e89a8dded
SIZE (rust/2024-10-17/cargo-1.82.0-aarch64-unknown-freebsd.tar.xz) = 9217928
SHA256 (rust/2024-10-17/rustc-1.82.0-x86_64-unknown-freebsd.tar.xz) = 9bc7885aa7434d9e9fe5e400bd14aba6b7bad47a957fbd12651c2038e8fd64f5
SIZE (rust/2024-10-17/rustc-1.82.0-x86_64-unknown-freebsd.tar.xz) = 51037096
SHA256 (rust/2024-10-17/rust-std-1.82.0-x86_64-unknown-freebsd.tar.xz) = 3927d64465cb5bedce595e3ebe728df2cafc719c5ffd68354180f0024b331a6f
SIZE (rust/2024-10-17/rust-std-1.82.0-x86_64-unknown-freebsd.tar.xz) = 28148888
SHA256 (rust/2024-10-17/cargo-1.82.0-x86_64-unknown-freebsd.tar.xz) = d6e96db4a4e78d58cfc9410cc3107e528c839fa2937f18aae8f217e5097a1c15
SIZE (rust/2024-10-17/cargo-1.82.0-x86_64-unknown-freebsd.tar.xz) = 10406292
SHA256 (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = c13982b87ae60cbe4fe6ddfa96cded7293c0d59011816e6f89cdfa4531964eea
SIZE (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = 62941904
SHA256 (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = cadc589d89ca68fb81ad2913e60e89348a75bd228725f82faba2d4c961a2aca7
SIZE (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = 25949604
SHA256 (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = efbd26868fef7fbca7da59591fdbacefa0f3ad5e263b9487d4fe07c93e0da588
SIZE (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = 9313164
SHA256 (rust/2024-09-05/rustc-1.81.0-i686-unknown-freebsd.tar.xz) = 5562e52a5d3bc7e6072838c0aa8e7e518fe2db74c0e3792204e1dc5306559b20
SIZE (rust/2024-09-05/rustc-1.81.0-i686-unknown-freebsd.tar.xz) = 68846504
SHA256 (rust/2024-09-05/rust-std-1.81.0-i686-unknown-freebsd.tar.xz) = 7f0422aa60f4df0fabc4a07708319b09f496833cc6c4111544710a683b0571b2
SIZE (rust/2024-09-05/rust-std-1.81.0-i686-unknown-freebsd.tar.xz) = 26734268
SHA256 (rust/2024-09-05/cargo-1.81.0-i686-unknown-freebsd.tar.xz) = 762a7d113f8c77ae8c50f07da840ccb917cb836b6fbd2427b09967e82189d50a
SIZE (rust/2024-09-05/cargo-1.81.0-i686-unknown-freebsd.tar.xz) = 10756764
SHA256 (rust/2024-09-05/rustc-1.81.0-powerpc-unknown-freebsd.tar.xz) = 801950501c837591740febb71f4ef70b461a665e6e899badd1dee7010b2b1757
SIZE (rust/2024-09-05/rustc-1.81.0-powerpc-unknown-freebsd.tar.xz) = 65322316
SHA256 (rust/2024-09-05/rust-std-1.81.0-powerpc-unknown-freebsd.tar.xz) = 3704d7d1c404698920373db1131a81eb3d5ec0c6b3dd4620c896144dddf3fe53
SIZE (rust/2024-09-05/rust-std-1.81.0-powerpc-unknown-freebsd.tar.xz) = 24778908
SHA256 (rust/2024-09-05/cargo-1.81.0-powerpc-unknown-freebsd.tar.xz) = 23f8b7c3195ba7626ac5c897707e36d5a5e701de79c950b3e58bd647e786faba
SIZE (rust/2024-09-05/cargo-1.81.0-powerpc-unknown-freebsd.tar.xz) = 9923104
SHA256 (rust/2024-09-05/rustc-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 478d738a735eb0d1d6dddaee977c4ce0dc5168fcbd9dcadf67a6fc571cc8986a
SIZE (rust/2024-09-05/rustc-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 63419468
SHA256 (rust/2024-09-05/rust-std-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 451227b91ed09e7813ffba77b4e17f9b919b11ad373b0bc87a84eec64b7b9a01
SIZE (rust/2024-09-05/rust-std-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 24849284
SHA256 (rust/2024-09-05/cargo-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 92dae5616bb090c9ae99d0006fe7612d64773d145f574a091b90cc764287f4ac
SIZE (rust/2024-09-05/cargo-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 9533220
SHA256 (rust/2024-09-05/rustc-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 5be810fe0ee72c734c8e00941f1c01a43506ef6063a3aa51e1e6dbb2fefb520b
SIZE (rust/2024-09-05/rustc-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 65284584
SHA256 (rust/2024-09-05/rust-std-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 247759fa4d96ec7c7ee88290700a4ef4c2799e8c8e66e7dafe81ca678d57e4f3
SIZE (rust/2024-09-05/rust-std-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 24899100
SHA256 (rust/2024-09-05/cargo-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 6e5141477f52caf26583e9d3263698ae427c89bec23b3af8b8e0d59f4e6b46ec
SIZE (rust/2024-09-05/cargo-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 9825936
SHA256 (rust/2024-09-05/rustc-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = eec81507223597baa72979407ac0594506aed0d3c42299eb0b8fcc49f27d2251
SIZE (rust/2024-09-05/rustc-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = 72380112
SHA256 (rust/2024-09-05/rust-std-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = 160ebd04a8e49ab9b6b3cff4c0e913a433810557fd5ccdb8839ba4facfbdcc3a
SIZE (rust/2024-09-05/rust-std-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = 24745684
SHA256 (rust/2024-09-05/cargo-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = a42a1fe5cf41c0baf74e69e0d6f9baf3e592570b232bd2c0f752a56f3622a446
SIZE (rust/2024-09-05/cargo-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = 11996032
SHA256 (rust/2024-10-17/rustc-1.82.0-i686-unknown-freebsd.tar.xz) = 0016215d5b3c034cbd8f332336d284690be30f7c088e926fdd2281182f165313
SIZE (rust/2024-10-17/rustc-1.82.0-i686-unknown-freebsd.tar.xz) = 71103120
SHA256 (rust/2024-10-17/rust-std-1.82.0-i686-unknown-freebsd.tar.xz) = bdf02f49d85c3e7a103bb43bf2982341d765b2afeff2994f5086f2963cbe0bcc
SIZE (rust/2024-10-17/rust-std-1.82.0-i686-unknown-freebsd.tar.xz) = 27840180
SHA256 (rust/2024-10-17/cargo-1.82.0-i686-unknown-freebsd.tar.xz) = e5b10d5a18b8f2512fd4aa53a7c30b6b9b61f2572cf59a401d075d3ba588f426
SIZE (rust/2024-10-17/cargo-1.82.0-i686-unknown-freebsd.tar.xz) = 10843032
SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc-unknown-freebsd.tar.xz) = b4f5b4599a4e9bbc3f90445bd0aae1aecf0d147947ea512e0f00dfa76a9e3cf2
SIZE (rust/2024-10-17/rustc-1.82.0-powerpc-unknown-freebsd.tar.xz) = 67416020
SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc-unknown-freebsd.tar.xz) = 7e7c8623ca7c3105d82478d4ae766ddf489a7e8fbaa01d40f32500d4de06a65d
SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc-unknown-freebsd.tar.xz) = 25162056
SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc-unknown-freebsd.tar.xz) = b6a66517fcf3a08ced4fd887dfa5318ccfa23e897c63666f16149755ec05ba63
SIZE (rust/2024-10-17/cargo-1.82.0-powerpc-unknown-freebsd.tar.xz) = 9984192
SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc64-unknown-freebsd.tar.xz) = e050efa9b992d891bf4669c5ecf3531eba6c9a630ed0cbd4c94e00c8cc66317e
SIZE (rust/2024-10-17/rustc-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 65447208
SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 9790d33816e253ba2a640c47fbf52b61f0c6841c04fe004561ac0fa82b74de90
SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 25120776
SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc64-unknown-freebsd.tar.xz) = b8bcfb00232aa49b380c2a6b2b4ad00ef0603d7e545b115046add963e20e3aa9
SIZE (rust/2024-10-17/cargo-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 9636840
SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 04d7fd15fe90fa5272802e5a3afe6baf4868a0018ecb6e1ecca8c2b009df5cd6
SIZE (rust/2024-10-17/rustc-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 67188864
SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = bb76f789c552ffdaab681fa90084e658c0027bbc99f5e8d07c3c0b99efe2181b
SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 25235320
SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 1e5f30101156510ac03833bf3362d41fc1b4603f6509dea3c71a8cc0fbb7d76b
SIZE (rust/2024-10-17/cargo-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 9908700
SHA256 (rust/2024-10-17/rustc-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = cb73b8677f807afee63481aaeb51136b5a7db4e9d194a646ba3c9e0c8c4d54cc
SIZE (rust/2024-10-17/rustc-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 71586632
SHA256 (rust/2024-10-17/rust-std-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = ff00c41174c771450ab4b962f7f41f2be18944d3c834fab4316181bec955d784
SIZE (rust/2024-10-17/rust-std-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 25011372
SHA256 (rust/2024-10-17/cargo-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 2f99b7d5f40d1f0f28f474b5e28298652a5e71d9a1bfcfa30ba1283b790f4d7d
SIZE (rust/2024-10-17/cargo-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 11545916

108
lang/rust/files/patch-vendor_cc.rs
View file

@ -8,48 +8,6 @@ until LLVM can be updated to use libc++ by default.
https://reviews.llvm.org/D77776
--- vendor/cc-1.0.79/src/lib.rs.orig 2021-03-04 20:58:54 UTC
+++ vendor/cc-1.0.79/src/lib.rs
@@ -2659,24 +2659,7 @@ impl Tool {
}
fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
- // Try to detect family of the tool from its name, falling back to Gnu.
- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
- if fname.contains("clang-cl") {
- ToolFamily::Msvc { clang_cl: true }
- } else if fname.ends_with("cl") || fname == "cl.exe" {
- ToolFamily::Msvc { clang_cl: false }
- } else if fname.contains("clang") {
- match clang_driver {
- Some("cl") => ToolFamily::Msvc { clang_cl: true },
- _ => ToolFamily::Clang,
- }
- } else {
- ToolFamily::Gnu
- }
- } else {
- ToolFamily::Gnu
- };
-
+ let family = ToolFamily::Gnu;
Tool {
path: path,
cc_wrapper_path: None,
--- vendor/cc-1.0.97/src/tool.rs.orig 2024-05-09 18:20:47 UTC
+++ vendor/cc-1.0.97/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc) {
(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
- (true, false, _) => Ok(ToolFamily::Clang {
- zig_cc: is_zig_cc(path, cargo_output),
- }),
+ (true, false, _) => Ok(ToolFamily::Gnu),
(false, false, true) => Ok(ToolFamily::Gnu),
(false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
--- vendor/cc-1.0.99/src/tool.rs.orig 2024-05-09 18:20:47 UTC
+++ vendor/cc-1.0.99/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
@ -59,61 +17,35 @@ https://reviews.llvm.org/D77776
- (true, false, _) => Ok(ToolFamily::Clang {
- zig_cc: is_zig_cc(path, cargo_output),
- }),
+ (true, false, _) => Ok(ToolFamily::Gnu),
(false, false, true) => Ok(ToolFamily::Gnu),
(false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
--- vendor/cc-1.0.105/src/tool.rs.orig 2024-05-09 18:20:47 UTC
+++ vendor/cc-1.0.105/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc) {
(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
- (true, false, _) => Ok(ToolFamily::Clang {
- zig_cc: is_zig_cc(path, cargo_output),
- }),
+ (true, false, _) => Ok(ToolFamily::Gnu),
(false, false, true) => Ok(ToolFamily::Gnu),
(false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
--- vendor/cc-1.1.5/src/tool.rs.orig 2024-05-09 18:20:47 UTC
+++ vendor/cc-1.1.5/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc) {
(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
- (true, false, _) => Ok(ToolFamily::Clang {
- zig_cc: is_zig_cc(path, cargo_output),
- }),
+ (true, false, _) => Ok(ToolFamily::Gnu),
(false, false, true) => Ok(ToolFamily::Gnu),
(false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
--- vendor/cc-1.1.6/src/tool.rs.orig 2024-05-09 18:20:47 UTC
+++ vendor/cc-1.1.6/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
--- vendor/cc-1.1.22/src/tool.rs.orig 2024-11-27 08:36:40.862061000 +0100
+++ vendor/cc-1.1.22/src/tool.rs 2024-11-27 08:38:23.622042000 +0100
@@ -174,9 +174,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc) {
(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
- (true, false, _) => Ok(ToolFamily::Clang {
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
(clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
- zig_cc: is_zig_cc(path, cargo_output),
- }),
+ (true, false, _) => Ok(ToolFamily::Gnu),
(false, false, true) => Ok(ToolFamily::Gnu),
(false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
(false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
(false, false, false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
--- vendor/cc-1.1.10/src/tool.rs.orig 2024-05-09 18:20:47 UTC
+++ vendor/cc-1.1.10/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
--- vendor/cc-1.1.23/src/tool.rs.orig 2024-11-27 08:36:40.862061000 +0100
+++ vendor/cc-1.1.23/src/tool.rs 2024-11-27 08:38:23.622042000 +0100
@@ -174,9 +174,7 @@ impl Tool {
match (clang, accepts_cl_style_flags, gcc) {
(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
- (true, false, _) => Ok(ToolFamily::Clang {
match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
(clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
- zig_cc: is_zig_cc(path, cargo_output),
- }),
+ (true, false, _) => Ok(ToolFamily::Gnu),
(false, false, true) => Ok(ToolFamily::Gnu),
(false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
(false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
(false, false, false, false, false) => {
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");

70
lang/rust/files/patch-vendor_libc-0.2.157 → lang/rust/files/patch-vendor_libc-0.2.159
View file

@ -22,8 +22,8 @@ Issue https://github.com/rust-lang/rust/issues/130677
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
index de34069eabdf2..68a8364194607 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
@@ -4,7 +4,7 @@
pub type nlink_t = u16;
// Type of `dev_t` changed from `u32` to `u64` in FreeBSD 12:
@ -35,8 +35,8 @@ index de34069eabdf2..68a8364194607 100644
s! {
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
index 10fcaa03a4ef6..197400ffb4e28 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
@@ -2,7 +2,7 @@
pub type nlink_t = u64;
@ -48,8 +48,8 @@ index 10fcaa03a4ef6..197400ffb4e28 100644
s! {
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
index ec6bce2a03091..d3a77d03c48d0 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
@@ -2,7 +2,7 @@
pub type nlink_t = u64;
@ -61,8 +61,8 @@ index ec6bce2a03091..d3a77d03c48d0 100644
pub type kssize_t = i64;
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
index 160a4baae481b..9d65317d29cb4 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
@@ -2,7 +2,7 @@
pub type nlink_t = u64;
@ -74,8 +74,8 @@ index 160a4baae481b..9d65317d29cb4 100644
pub type kssize_t = i64;
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
index d73215a68ec33..f76208400f324 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
@@ -2,7 +2,7 @@
pub type nlink_t = u64;
@ -120,8 +120,8 @@ similarity index 89%
rename from src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
rename to src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs.orig 2024-10-24 17:21:07.154172000 +0200
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs 2024-10-24 17:21:02.029962000 +0200
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs.orig 2024-10-24 17:21:07.154172000 +0200
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs 2024-10-24 17:21:02.029962000 +0200
@@ -0,0 +1,34 @@
+#[repr(C)]
+#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]
@ -160,8 +160,8 @@ rename to src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
index 80c6fa1684530..5c1156581fd61 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
@@ -3,12 +3,10 @@
pub struct stat {
pub st_dev: ::dev_t,
@ -198,8 +198,8 @@ index 80c6fa1684530..5c1156581fd61 100644
impl ::Copy for ::stat {}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
index 68a8364194607..e416ebf745841 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
@@ -479,10 +479,11 @@ extern "C" {
}
@ -217,8 +217,8 @@ index 68a8364194607..e416ebf745841 100644
}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
index 197400ffb4e28..c4431a6458e8f 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
@@ -218,6 +218,40 @@ s! {
/// kthread flag.
pub ki_tdflags: ::c_long,
@ -279,7 +279,7 @@ index 197400ffb4e28..c4431a6458e8f 100644
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
deleted file mode 100644
index 80c6fa1684530..0000000000000
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[repr(C)]
@ -318,8 +318,8 @@ index 80c6fa1684530..0000000000000
-}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
index d3a77d03c48d0..118404e8b089b 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
@@ -228,6 +228,40 @@ s! {
/// kthread flag.
pub ki_tdflags: ::c_long,
@ -380,7 +380,7 @@ index d3a77d03c48d0..118404e8b089b 100644
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
deleted file mode 100644
index 80c6fa1684530..0000000000000
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[repr(C)]
@ -419,8 +419,8 @@ index 80c6fa1684530..0000000000000
-}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
index 9d65317d29cb4..e624dd7201b0a 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
@@ -228,6 +228,40 @@ s! {
/// kthread flag.
pub ki_tdflags: ::c_long,
@ -481,7 +481,7 @@ index 9d65317d29cb4..e624dd7201b0a 100644
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
deleted file mode 100644
index 80c6fa1684530..0000000000000
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[repr(C)]
@ -520,8 +520,8 @@ index 80c6fa1684530..0000000000000
-}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
index f76208400f324..a299af7d5d53e 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
@@ -228,6 +228,40 @@ s! {
/// kthread flag.
pub ki_tdflags: ::c_long,
@ -581,8 +581,8 @@ index f76208400f324..a299af7d5d53e 100644
mod x86_64;
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs
index c3c576ed66681..31a660e7d0a22 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/x86.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/x86.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/x86.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/x86.rs
@@ -42,31 +42,6 @@ s_no_extra_traits! {
}
@ -630,8 +630,8 @@ Subject: [PATCH] fixup: fix build on powerpc, powerpc64, and arm
diff --git a/src/unix/bsd/freebsdlike/freebsd/arm.rs b/src/unix/bsd/freebsdlike/freebsd/arm.rs
index 300b3dd45ca9d..8ff500c65981c 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/arm.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/arm.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/arm.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/arm.rs
@@ -6,36 +6,6 @@ pub type time_t = i64;
pub type suseconds_t = i32;
pub type register_t = i32;
@ -671,8 +671,8 @@ index 300b3dd45ca9d..8ff500c65981c 100644
if #[cfg(libc_const_size_of)] {
diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
index a0120c337e0ad..f84062ba34b93 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
@@ -6,32 +6,6 @@ pub type time_t = i64;
pub type suseconds_t = i32;
pub type register_t = i32;
@ -708,8 +708,8 @@ index a0120c337e0ad..f84062ba34b93 100644
if #[cfg(libc_const_size_of)] {
diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
index 7f5b9752264e3..69cf4c5fc88c7 100644
--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
@@ -6,32 +6,6 @@ pub type time_t = i64;
pub type suseconds_t = i64;
pub type register_t = i64;