Attachment 251430 Details for Bug 279707 – v0

[patch] v0

0001-lang-rust-Update-to-1.79.0.patch (text/plain), 24.05 KB, created by Mikael Urankar on 2024-06-13 11:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2024-06-13 11:20:09 UTC

Size: 24.05 KB

patch

obsolete

>From b530070cee89f48cd64f74dca77138364b6342ce Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Tue, 11 Jun 2024 12:39:22 +0200
>Subject: [PATCH] lang/rust: Update to 1.79.0
>
>Announce:	https://blog.rust-lang.org/
>ChangeLog:	https://github.com/rust-lang/rust/releases/tag/1.79.0
>
>PR:		XXX
>Tested by:	mikael
>---
> Mk/Uses/cargo.mk                              |   2 +-
> Mk/bsd.gecko.mk                               |   2 +-
> lang/rust-bootstrap/Makefile                  |   3 +-
> lang/rust-bootstrap/distinfo                  |   6 +-
> lang/rust/Makefile                            |   9 +-
> lang/rust/distinfo                            | 102 ++++++++---------
> ...dor_rustix_src_backend_libc_fs_syscalls.rs |  24 ----
> lang/rust/files/patch-vendor_cc.rs            | 107 ++++++++++++++++++
> lang/rust/files/patch-vendor_cc_src_tool.rs   |  36 ------
> .../patch-vendor_openssl-src_src_lib.rs       |   4 +-
> 10 files changed, 169 insertions(+), 126 deletions(-)
> delete mode 100644 lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs
> create mode 100644 lang/rust/files/patch-vendor_cc.rs
> delete mode 100644 lang/rust/files/patch-vendor_cc_src_tool.rs
>
>diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
>index 6083ca72564..11e678f3361 100644
>--- a/Mk/Uses/cargo.mk
>+++ b/Mk/Uses/cargo.mk
>@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}
> 
> CARGO_BUILDDEP?=	yes
> .  if ${CARGO_BUILDDEP:tl} == "yes"
>-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.78.0:lang/${RUST_DEFAULT}
>+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.79.0:lang/${RUST_DEFAULT}
> .  elif ${CARGO_BUILDDEP:tl} == "any-version"
> BUILD_DEPENDS+=	${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
> .  endif
>diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
>index 5a0c48c6bbc..1c650a6d6eb 100644
>--- a/Mk/bsd.gecko.mk
>+++ b/Mk/bsd.gecko.mk
>@@ -74,7 +74,7 @@ BINARY_ALIAS+=	python3=${PYTHON_CMD}
> BUNDLE_LIBS=	yes
> 
> BUILD_DEPENDS+=	rust-cbindgen>=0.26.0:devel/rust-cbindgen \
>-				${RUST_DEFAULT}>=1.78.0:lang/${RUST_DEFAULT} \
>+				${RUST_DEFAULT}>=1.79.0:lang/${RUST_DEFAULT} \
> 				node:www/node
> LIB_DEPENDS+=	libdrm.so:graphics/libdrm
> RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
>diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile
>index 62b434cd2a0..8d70749ff11 100644
>--- a/lang/rust-bootstrap/Makefile
>+++ b/lang/rust-bootstrap/Makefile
>@@ -2,7 +2,7 @@
> # to upload them to ~/public_distfiles on freefall in preparation
> # for the next lang/rust update.
> PORTNAME=	rust
>-PORTVERSION=	1.78.0
>+PORTVERSION=	1.79.0
> CATEGORIES=	lang
> MASTER_SITES=	https://static.rust-lang.org/dist/
> PKGNAMEPREFIX=	${FLAVOR:S/_/-/g}-
>@@ -79,7 +79,6 @@ do-configure:
> # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
> 	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
> 		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
>-	@${ECHO_CMD} 'changelog-seen=2' > ${WRKSRC}/config.toml
> 	@${ECHO_CMD} '[build]' >> ${WRKSRC}/config.toml
> 	@${ECHO_CMD} 'build-dir="${WRKDIR}/_build"' >> ${WRKSRC}/config.toml
> 	@${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml
>diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo
>index ff788c17a5e..86c3b74c7f2 100644
>--- a/lang/rust-bootstrap/distinfo
>+++ b/lang/rust-bootstrap/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1714719126
>-SHA256 (rust/rustc-1.78.0-src.tar.xz) = 8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece
>-SIZE (rust/rustc-1.78.0-src.tar.xz) = 159181212
>+TIMESTAMP = 1718102335
>+SHA256 (rust/rustc-1.79.0-src.tar.xz) = ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a
>+SIZE (rust/rustc-1.79.0-src.tar.xz) = 162359512
>diff --git a/lang/rust/Makefile b/lang/rust/Makefile
>index eb4f70f4b58..342d0037f33 100644
>--- a/lang/rust/Makefile
>+++ b/lang/rust/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	rust
>-PORTVERSION?=	1.78.0
>+PORTVERSION?=	1.79.0
> PORTREVISION?=	0
> CATEGORIES=	lang
> MASTER_SITES=	https://static.rust-lang.org/dist/:src \
>@@ -67,8 +67,8 @@ WASM_VARS=		_COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
> 			_RUST_TARGETS+=wasm32-unknown-unknown
> 
> # See WRKSRC/src/stage0.json for the date and version values
>-BOOTSTRAPS_DATE?=		2024-03-21
>-RUST_BOOTSTRAP_VERSION?=	1.77.0
>+BOOTSTRAPS_DATE?=		2024-05-02
>+RUST_BOOTSTRAP_VERSION?=	1.78.0
> 
> CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
> 
>@@ -153,9 +153,6 @@ do-configure:
> 	@cd ${WRKDIR}/${_component}-*-${OPSYS:tl} && \
> 		${SH} install.sh --prefix=${WRKDIR}/bootstrap --verbose
> .endfor
>-.if !defined(NIGHTLY_DATE)
>-	@${ECHO_CMD} 'changelog-seen=2' > ${WRKSRC}/config.toml
>-.endif
> 	@${ECHO_CMD} '[build]' >> ${WRKSRC}/config.toml
> 	@${ECHO_CMD} 'build-dir="${WRKDIR}/_build"' >> ${WRKSRC}/config.toml
> 	@${ECHO_CMD} 'build-stage=2' >> ${WRKSRC}/config.toml
>diff --git a/lang/rust/distinfo b/lang/rust/distinfo
>index 34146c2d3e7..efa253e3b72 100644
>--- a/lang/rust/distinfo
>+++ b/lang/rust/distinfo
>@@ -1,51 +1,51 @@
>-TIMESTAMP = 1714719125
>-SHA256 (rust/rustc-1.78.0-src.tar.xz) = 8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece
>-SIZE (rust/rustc-1.78.0-src.tar.xz) = 159181212
>-SHA256 (rust/2024-03-21/rustc-1.77.0-aarch64-unknown-freebsd.tar.xz) = b8c0c1f4ac561c94023ac3e61bb05cc48868b08b408e4a889209628552cfa696
>-SIZE (rust/2024-03-21/rustc-1.77.0-aarch64-unknown-freebsd.tar.xz) = 55677936
>-SHA256 (rust/2024-03-21/rust-std-1.77.0-aarch64-unknown-freebsd.tar.xz) = cf609884cf154e8ba9bd3838bf508c100c5420dd9b62dcdc1d2d772637745806
>-SIZE (rust/2024-03-21/rust-std-1.77.0-aarch64-unknown-freebsd.tar.xz) = 25613204
>-SHA256 (rust/2024-03-21/cargo-1.77.0-aarch64-unknown-freebsd.tar.xz) = bd6d57c016f64facd353c16d4540b894ad46a8153c03292c4dbdd1e71883d296
>-SIZE (rust/2024-03-21/cargo-1.77.0-aarch64-unknown-freebsd.tar.xz) = 8789392
>-SHA256 (rust/2024-03-21/rustc-1.77.0-x86_64-unknown-freebsd.tar.xz) = c8f690079fa43d18c644b7239d884a4f40319299ed04f274be85e8572398b7a0
>-SIZE (rust/2024-03-21/rustc-1.77.0-x86_64-unknown-freebsd.tar.xz) = 45066612
>-SHA256 (rust/2024-03-21/rust-std-1.77.0-x86_64-unknown-freebsd.tar.xz) = f4300a839fa6df8a3861b1583d47f17b5efd72a09466a6056ed654e7415936fd
>-SIZE (rust/2024-03-21/rust-std-1.77.0-x86_64-unknown-freebsd.tar.xz) = 26400816
>-SHA256 (rust/2024-03-21/cargo-1.77.0-x86_64-unknown-freebsd.tar.xz) = 82b166b6d3e0e4f09224bfc75e0d3a9db75228983d20e021adef3922c50c35ce
>-SIZE (rust/2024-03-21/cargo-1.77.0-x86_64-unknown-freebsd.tar.xz) = 9765968
>-SHA256 (rust/2024-03-21/rustc-1.77.0-armv7-unknown-freebsd.tar.xz) = beb39431f8b0625607b2a276c77001c5e71613005a6b2b72a3bd94878e8d2c5a
>-SIZE (rust/2024-03-21/rustc-1.77.0-armv7-unknown-freebsd.tar.xz) = 56049192
>-SHA256 (rust/2024-03-21/rust-std-1.77.0-armv7-unknown-freebsd.tar.xz) = fd9ad61cd1bdc3e743b6d86a4f1b635c365750d6ea7de193eba58f608cde9a99
>-SIZE (rust/2024-03-21/rust-std-1.77.0-armv7-unknown-freebsd.tar.xz) = 25031820
>-SHA256 (rust/2024-03-21/cargo-1.77.0-armv7-unknown-freebsd.tar.xz) = 38192d50b9358b60dffb93a70986a05271f410ba75f7d2a66671281a7d53ea58
>-SIZE (rust/2024-03-21/cargo-1.77.0-armv7-unknown-freebsd.tar.xz) = 8806328
>-SHA256 (rust/2024-03-21/rustc-1.77.0-i686-unknown-freebsd.tar.xz) = f673b37ca9d259ac619987ff0559c922f6284eaa6c77e6dcf04f665cba46ecc7
>-SIZE (rust/2024-03-21/rustc-1.77.0-i686-unknown-freebsd.tar.xz) = 62316264
>-SHA256 (rust/2024-03-21/rust-std-1.77.0-i686-unknown-freebsd.tar.xz) = 2268a4bbdf103e66d58229aa522948af25d91507a982d883c9835a8fc4ea869c
>-SIZE (rust/2024-03-21/rust-std-1.77.0-i686-unknown-freebsd.tar.xz) = 26171668
>-SHA256 (rust/2024-03-21/cargo-1.77.0-i686-unknown-freebsd.tar.xz) = 81433410da18557780134ff00dcbf9d1945b8f54cd7051273246cc047761e9a3
>-SIZE (rust/2024-03-21/cargo-1.77.0-i686-unknown-freebsd.tar.xz) = 10015380
>-SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc-unknown-freebsd.tar.xz) = 9a45efe873a3862909e5e1252e481b6aef72216b22ad1c317eeaaafa9fdfaf90
>-SIZE (rust/2024-03-21/rustc-1.77.0-powerpc-unknown-freebsd.tar.xz) = 59996448
>-SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc-unknown-freebsd.tar.xz) = 2e0ab25bfeb0efc5c5aafb753b34b65692c4e87d2083c865f726db5eff9fdf24
>-SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc-unknown-freebsd.tar.xz) = 24278008
>-SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc-unknown-freebsd.tar.xz) = 22fdac0eadc5202c7fb0a1268748b793e95897fd5c95545d13e5140df7eda97b
>-SIZE (rust/2024-03-21/cargo-1.77.0-powerpc-unknown-freebsd.tar.xz) = 9944700
>-SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 53d7655656c53d065a108bf57bfbf7be1f7e14f8e1a00be06d2815d35a1375ce
>-SIZE (rust/2024-03-21/rustc-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 58964296
>-SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 905ddb832b0e005248c044f603afada55674fe3bceca96ca3212eec2130d9746
>-SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 24292400
>-SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc64-unknown-freebsd.tar.xz) = d12e818d9221f1fe9590b0153e018937ba2c90aba081578dc87792605467c839
>-SIZE (rust/2024-03-21/cargo-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 9617420
>-SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = e46369a0bbac72a8a931aed5efb71d47c41c135415380fcf06daf9c77dfc7609
>-SIZE (rust/2024-03-21/rustc-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 60839172
>-SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = dda78aad0a5b500321b1067afb6f2f423c2a1811c75d8c7a2c54a7498f0d9975
>-SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 24364400
>-SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = cf454e20b7d7356f9a08c368d5d00fefc5b4d591e263a57df15d8c5d24d792f8
>-SIZE (rust/2024-03-21/cargo-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 9978364
>-SHA256 (rust/2024-03-21/rustc-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = ca3ab27fd22c1919e9b1c6b0be3db9dfc4571a867db83007f68356ebedc3c08f
>-SIZE (rust/2024-03-21/rustc-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 70096420
>-SHA256 (rust/2024-03-21/rust-std-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 2e3a76771d1281606793f7724521ca7e7019d1a00f1cef3da6bf961348228d27
>-SIZE (rust/2024-03-21/rust-std-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 24331376
>-SHA256 (rust/2024-03-21/cargo-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = a728e4333c602d4bc330964df090f6bd0e3228744f55640595957f9862ba735c
>-SIZE (rust/2024-03-21/cargo-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 12483200
>+TIMESTAMP = 1718102334
>+SHA256 (rust/rustc-1.79.0-src.tar.xz) = ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a
>+SIZE (rust/rustc-1.79.0-src.tar.xz) = 162359512
>+SHA256 (rust/2024-05-02/rustc-1.78.0-aarch64-unknown-freebsd.tar.xz) = 796e9d0ef57403682c2a1f9fc27055fd76a848fea18b2d1eef83c54224539065
>+SIZE (rust/2024-05-02/rustc-1.78.0-aarch64-unknown-freebsd.tar.xz) = 57319612
>+SHA256 (rust/2024-05-02/rust-std-1.78.0-aarch64-unknown-freebsd.tar.xz) = 43e7aad140a3bd02cca08f6c45a5baec62d5e099b6e5197703f4bf59d5cc7c5c
>+SIZE (rust/2024-05-02/rust-std-1.78.0-aarch64-unknown-freebsd.tar.xz) = 25417584
>+SHA256 (rust/2024-05-02/cargo-1.78.0-aarch64-unknown-freebsd.tar.xz) = 0bf819a3eab9ec60b8a797d2c90c157135e7002502c3326c211003d6b5d1f696
>+SIZE (rust/2024-05-02/cargo-1.78.0-aarch64-unknown-freebsd.tar.xz) = 8816768
>+SHA256 (rust/2024-05-02/rustc-1.78.0-x86_64-unknown-freebsd.tar.xz) = 24c92fea05a48a16fa647c4eb79cca551b95066065ba9bcf1a41a70de418584e
>+SIZE (rust/2024-05-02/rustc-1.78.0-x86_64-unknown-freebsd.tar.xz) = 46716800
>+SHA256 (rust/2024-05-02/rust-std-1.78.0-x86_64-unknown-freebsd.tar.xz) = dc31c98b26cafc76346f3dba949727a11f930fd8a543b136d845759d4b8a4c7b
>+SIZE (rust/2024-05-02/rust-std-1.78.0-x86_64-unknown-freebsd.tar.xz) = 26202124
>+SHA256 (rust/2024-05-02/cargo-1.78.0-x86_64-unknown-freebsd.tar.xz) = b6eeab7031c134dad1db61551be597b463d4eb7ceb4860fcf5a83968d8c2f161
>+SIZE (rust/2024-05-02/cargo-1.78.0-x86_64-unknown-freebsd.tar.xz) = 9871768
>+SHA256 (rust/2024-05-02/rustc-1.78.0-armv7-unknown-freebsd.tar.xz) = 948cc2d0952f38315bc9d68c4f5d1bdde7f741fb56a9648a6810faf57c2c67a7
>+SIZE (rust/2024-05-02/rustc-1.78.0-armv7-unknown-freebsd.tar.xz) = 57684964
>+SHA256 (rust/2024-05-02/rust-std-1.78.0-armv7-unknown-freebsd.tar.xz) = bb9bdf1fb8dfcd7a94ddd85cacb7d01f95b9855ab1bbaf99edaa7195c04740ff
>+SIZE (rust/2024-05-02/rust-std-1.78.0-armv7-unknown-freebsd.tar.xz) = 24903216
>+SHA256 (rust/2024-05-02/cargo-1.78.0-armv7-unknown-freebsd.tar.xz) = 2ac46611d5a150a243dbc303fb1e5375ef0663afa724f2bdfffa915f8c0e9a4a
>+SIZE (rust/2024-05-02/cargo-1.78.0-armv7-unknown-freebsd.tar.xz) = 8884760
>+SHA256 (rust/2024-05-02/rustc-1.78.0-i686-unknown-freebsd.tar.xz) = 38b501d5b02abb94cb40c4738e01389fb6a086fc3426aee59fb9f918222ec779
>+SIZE (rust/2024-05-02/rustc-1.78.0-i686-unknown-freebsd.tar.xz) = 64399464
>+SHA256 (rust/2024-05-02/rust-std-1.78.0-i686-unknown-freebsd.tar.xz) = 53e03241d71df0db0440c716dce8d43e42b9a1ed319fbc468a3b2d0bd03676b2
>+SIZE (rust/2024-05-02/rust-std-1.78.0-i686-unknown-freebsd.tar.xz) = 26038480
>+SHA256 (rust/2024-05-02/cargo-1.78.0-i686-unknown-freebsd.tar.xz) = f75b1d7f45736a5d048e4b68e41bbe986f3f414fd8be0eb2d116133868ddb110
>+SIZE (rust/2024-05-02/cargo-1.78.0-i686-unknown-freebsd.tar.xz) = 10154936
>+SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc-unknown-freebsd.tar.xz) = dbe7c32f49be34098eb1199e3ce2e3cef748fc0a7339448aa258c7f4e41f9d1a
>+SIZE (rust/2024-05-02/rustc-1.78.0-powerpc-unknown-freebsd.tar.xz) = 61054892
>+SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc-unknown-freebsd.tar.xz) = f130932c829c88064b89de7b511cacfa4d49273339a325e73f4f83b55592a764
>+SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc-unknown-freebsd.tar.xz) = 24067100
>+SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc-unknown-freebsd.tar.xz) = 76b93267895bf2f6fc24c6b46e68a6593a8d065545b0d46afeaddb4f9eda5615
>+SIZE (rust/2024-05-02/cargo-1.78.0-powerpc-unknown-freebsd.tar.xz) = 9564996
>+SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc64-unknown-freebsd.tar.xz) = dac918f38b284d62eca95df2b29bbfb6eb6c8e8419bf57ac669f8b181def737a
>+SIZE (rust/2024-05-02/rustc-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 59532620
>+SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 9eebd51b38a3a24ae57cec39b7368c2c1b30fc67c8d651d0829a752976d49158
>+SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 24058796
>+SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 24ee0edbed6147aedd7d0d7d5f10774c59b3eefeabdbb20adca826ab79a7b608
>+SIZE (rust/2024-05-02/cargo-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 9137688
>+SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = a9e26efd3362b129d2002d6a629bc94abeadc721a776192887e13af78fd35738
>+SIZE (rust/2024-05-02/rustc-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 60918936
>+SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 00a49af7bc1dc16ec18eec34b71055d6d42923220569c06d27ed3b5e0e5c4589
>+SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 24168348
>+SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 79b6a00f2ea9fb88506dfefb057bd9b8abdbb01f9cf2fefe7c1dc3f146d9edc3
>+SIZE (rust/2024-05-02/cargo-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 9372912
>+SHA256 (rust/2024-05-02/rustc-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 21f1e2f76501717810043e907ca7192447f010a0562d9a52253176a8655b3cf5
>+SIZE (rust/2024-05-02/rustc-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 76153676
>+SHA256 (rust/2024-05-02/rust-std-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 73d1645a06c4f2f8ad2462ba04878f6b8f0b7d93da1e562b4428a5e23c34cefb
>+SIZE (rust/2024-05-02/rust-std-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 24204228
>+SHA256 (rust/2024-05-02/cargo-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = b547ef7ae9d701b9bc618165f9882e3e40d2db74f6cb70a12a4b6b4ebaf2b414
>+SIZE (rust/2024-05-02/cargo-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 13083732
>diff --git a/lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs b/lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs
>deleted file mode 100644
>index 423655a6267..00000000000
>--- a/lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-gnueabihf was changed to gnu in this commit and it breaks rustix
>-https://github.com/rust-lang/rust/commit/93ec0e6299e31e6857e8ad741750034f35762b11
>-
>-
>---- vendor/rustix/src/backend/libc/fs/syscalls.rs.orig	2024-05-06 16:29:17.182875000 +0200
>-+++ vendor/rustix/src/backend/libc/fs/syscalls.rs	2024-05-06 16:29:48.897744000 +0200
>-@@ -140,7 +140,7 @@ pub(crate) fn open(path: &CStr, oflags: OFlags, mode: 
>- pub(crate) fn open(path: &CStr, oflags: OFlags, mode: Mode) -> io::Result<OwnedFd> {
>-     // Work around <https://sourceware.org/bugzilla/show_bug.cgi?id=17523>.
>-     // glibc versions before 2.25 don't handle `O_TMPFILE` correctly.
>--    #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))]
>-+    #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))]
>-     if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() {
>-         return open_via_syscall(path, oflags, mode);
>-     }
>-@@ -203,7 +203,7 @@ pub(crate) fn openat(
>- ) -> io::Result<OwnedFd> {
>-     // Work around <https://sourceware.org/bugzilla/show_bug.cgi?id=17523>.
>-     // glibc versions before 2.25 don't handle `O_TMPFILE` correctly.
>--    #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))]
>-+    #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))]
>-     if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() {
>-         return openat_via_syscall(dirfd, path, oflags, mode);
>-     }
>diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs
>new file mode 100644
>index 00000000000..5b6888c4c08
>--- /dev/null
>+++ b/lang/rust/files/patch-vendor_cc.rs
>@@ -0,0 +1,107 @@
>+When the compiler has "clang" in its name the cc crate will pass
>+an LLVM target triple to it.  Rust uses a triple that lacks the OS
>+version and LLVM will default to FreeBSD 9 behavior, i.e., it will
>+default to libstdc++ which is no longer available in newer releases.
>+
>+To avoid this issue assume we have a GNU compatible toolchain instead
>+until LLVM can be updated to use libc++ by default.
>+
>+https://reviews.llvm.org/D77776
>+
>+--- vendor/cc-1.0.73/src/lib.rs.orig	2021-03-04 20:58:54 UTC
>++++ vendor/cc-1.0.73/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.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.90/src/tool.rs.orig	2024-03-18 11:23:17 UTC
>++++ vendor/cc-1.0.90/src/tool.rs
>+@@ -122,22 +122,7 @@ impl Tool {
>+         };
>+ 
>+         // 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 {
>+-                detect_family(&path)
>+-            }
>+-        } else {
>+-            detect_family(&path)
>+-        };
>++        let family = ToolFamily::Gnu;
>+ 
>+         Tool {
>+             path,
>+--- vendor/cc-1.0.92/src/tool.rs.orig	2024-05-09 18:20:47 UTC
>++++ vendor/cc-1.0.92/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");
>diff --git a/lang/rust/files/patch-vendor_cc_src_tool.rs b/lang/rust/files/patch-vendor_cc_src_tool.rs
>deleted file mode 100644
>index 42c63f43659..00000000000
>--- a/lang/rust/files/patch-vendor_cc_src_tool.rs
>+++ /dev/null
>@@ -1,36 +0,0 @@
>-When the compiler has "clang" in its name the cc crate will pass
>-an LLVM target triple to it.  Rust uses a triple that lacks the OS
>-version and LLVM will default to FreeBSD 9 behavior, i.e., it will
>-default to libstdc++ which is no longer available in newer releases.
>-
>-To avoid this issue assume we have a GNU compatible toolchain instead
>-until LLVM can be updated to use libc++ by default.
>-
>-https://reviews.llvm.org/D77776
>-
>---- vendor/cc/src/tool.rs.orig	2024-03-18 11:23:17 UTC
>-+++ vendor/cc/src/tool.rs
>-@@ -122,22 +122,7 @@ impl Tool {
>-         };
>- 
>-         // 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 {
>--                detect_family(&path)
>--            }
>--        } else {
>--            detect_family(&path)
>--        };
>-+        let family = ToolFamily::Gnu;
>- 
>-         Tool {
>-             path,
>diff --git a/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs b/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs
>index 3171b5769f1..c7fd8cb30f4 100644
>--- a/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs
>+++ b/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs
>@@ -1,5 +1,5 @@
>---- vendor/openssl-src/src/lib.rs.orig	2021-11-04 11:27:54 UTC
>-+++ vendor/openssl-src/src/lib.rs
>+--- vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs.orig	2021-11-04 11:27:54 UTC
>++++ vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs
> @@ -260,6 +260,7 @@ impl Build {
>              "powerpc64le-unknown-freebsd" => "BSD-generic64",
>              "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
>-- 
>2.45.0
>

Actions: View | Diff

Attachments on bug 279707: 251430 | 251452