Attachment 247371 Details for Bug 276033 – v0

[patch] v0

0001-lang-rust-Update-to-1.75.0.patch (text/plain), 18.53 KB, created by Mikael Urankar on 2023-12-31 09:39:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2023-12-31 09:39:06 UTC

Size: 18.53 KB

patch

obsolete

>From 08dd4ca67213f95090185ff6605441e5bd8fa7cc Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Fri, 22 Dec 2023 09:40:47 +0100
>Subject: [PATCH 1/2] lang/rust: Update to 1.75.0
>
>Announce:	https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html
>ChangeLog:	https://github.com/rust-lang/rust/releases/tag/1.75.0
>
>PR:
>Tested by:	mikael,pkubaj
>---
> Mk/Uses/cargo.mk                              |   2 +-
> Mk/bsd.gecko.mk                               |   2 +-
> lang/rust-bootstrap/Makefile                  |   2 +-
> lang/rust-bootstrap/distinfo                  |   6 +-
> lang/rust/Makefile                            |   6 +-
> lang/rust/distinfo                            | 102 +++++++++---------
> ..._target_src_spec_i686__unknown__freebsd.rs |  11 --
> ...src_spec_targets_i686__unknown__freebsd.rs |  13 +++
> ...ootstrap_src_core_build__steps_install.rs} |   4 +-
> ...ec_targets_powerpc64__unknown__freebsd.rs} |   4 +-
> 10 files changed, 77 insertions(+), 75 deletions(-)
> delete mode 100644 lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
> create mode 100644 lang/rust/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs
> rename lang/rust/files/{patch-src_bootstrap_install.rs => patch-src_bootstrap_src_core_build__steps_install.rs} (81%)
> rename lang/rust/{files/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs => patch-compiler_rustc__target_src_spec_targets_powerpc64__unknown__freebsd.rs} (71%)
>
>diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
>index a82badd346..5e3082dd1b 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.74.0:lang/${RUST_DEFAULT}
>+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.75.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 8cee3eb40d..824e726c49 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.74.0:lang/${RUST_DEFAULT} \
>+				${RUST_DEFAULT}>=1.75.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 eb36cc56a0..ddc6e71d71 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.74.0
>+PORTVERSION=	1.75.0
> CATEGORIES=	lang
> MASTER_SITES=	https://static.rust-lang.org/dist/
> PKGNAMEPREFIX=	${FLAVOR:S/_/-/g}-
>diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo
>index a48712dba1..f60df17b59 100644
>--- a/lang/rust-bootstrap/distinfo
>+++ b/lang/rust-bootstrap/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1700146847
>-SHA256 (rust/rustc-1.74.0-src.tar.xz) = 23705e38c1a37acfd7fbb921c5dd8772619476e80d0b3b39ac8eb45bc0c33187
>-SIZE (rust/rustc-1.74.0-src.tar.xz) = 155975536
>+TIMESTAMP = 1703234390
>+SHA256 (rust/rustc-1.75.0-src.tar.xz) = 4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340
>+SIZE (rust/rustc-1.75.0-src.tar.xz) = 159624388
>diff --git a/lang/rust/Makefile b/lang/rust/Makefile
>index d035127d64..5180317611 100644
>--- a/lang/rust/Makefile
>+++ b/lang/rust/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	rust
>-PORTVERSION?=	1.74.1
>+PORTVERSION?=	1.75.0
> PORTREVISION?=	0
> CATEGORIES=	lang
> MASTER_SITES=	https://static.rust-lang.org/dist/:src \
>@@ -69,8 +69,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?=		2023-10-05
>-RUST_BOOTSTRAP_VERSION?=	1.73.0
>+BOOTSTRAPS_DATE?=		2023-11-16
>+RUST_BOOTSTRAP_VERSION?=	1.74.0
> 
> CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
> 
>diff --git a/lang/rust/distinfo b/lang/rust/distinfo
>index 64374eccc6..0573e1e5fb 100644
>--- a/lang/rust/distinfo
>+++ b/lang/rust/distinfo
>@@ -1,51 +1,51 @@
>-TIMESTAMP = 1701965605
>-SHA256 (rust/rustc-1.74.1-src.tar.xz) = b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e
>-SIZE (rust/rustc-1.74.1-src.tar.xz) = 155968724
>-SHA256 (rust/2023-10-05/rustc-1.73.0-aarch64-unknown-freebsd.tar.xz) = 0d9056ba935490d870becfdc46ec451d2218a052c4a51fc8d17efbecf91c3189
>-SIZE (rust/2023-10-05/rustc-1.73.0-aarch64-unknown-freebsd.tar.xz) = 57026992
>-SHA256 (rust/2023-10-05/rust-std-1.73.0-aarch64-unknown-freebsd.tar.xz) = c4fd3e440d9942d70363260a85e96adfde68ba1205268a7cefc9051c6e7d75b7
>-SIZE (rust/2023-10-05/rust-std-1.73.0-aarch64-unknown-freebsd.tar.xz) = 26034952
>-SHA256 (rust/2023-10-05/cargo-1.73.0-aarch64-unknown-freebsd.tar.xz) = 0f406952f9b655c79bc8ac795d340cb2e9f64937e9b4cf00792d6f4d5d814b55
>-SIZE (rust/2023-10-05/cargo-1.73.0-aarch64-unknown-freebsd.tar.xz) = 7962080
>-SHA256 (rust/2023-10-05/rustc-1.73.0-x86_64-unknown-freebsd.tar.xz) = 6ef8e221cf0eece69ea96d78d66a405d828329954a517c9eb52a55127b1ed693
>-SIZE (rust/2023-10-05/rustc-1.73.0-x86_64-unknown-freebsd.tar.xz) = 45990144
>-SHA256 (rust/2023-10-05/rust-std-1.73.0-x86_64-unknown-freebsd.tar.xz) = 80c37ead26b67bd1c0cfc0de6de4afb654245bb71dc26563f777a20e341d22b8
>-SIZE (rust/2023-10-05/rust-std-1.73.0-x86_64-unknown-freebsd.tar.xz) = 26683900
>-SHA256 (rust/2023-10-05/cargo-1.73.0-x86_64-unknown-freebsd.tar.xz) = bed55ae43071493fcb54e4b01db28937fe1423044f2f4db3f44b2e1f0ceaddde
>-SIZE (rust/2023-10-05/cargo-1.73.0-x86_64-unknown-freebsd.tar.xz) = 8780376
>-SHA256 (rust/2023-10-05/rustc-1.73.0-armv7-unknown-freebsd.tar.xz) = fa0bf88e1e564ac1f90f7c5ee9c5b6d6376b5da17692a6f1e4a66254bc6b7845
>-SIZE (rust/2023-10-05/rustc-1.73.0-armv7-unknown-freebsd.tar.xz) = 56991736
>-SHA256 (rust/2023-10-05/rust-std-1.73.0-armv7-unknown-freebsd.tar.xz) = 8c548fc69dc3a153927ffb9a6e2c07ae3bba4bc1b6ec22facfba02319acba5dd
>-SIZE (rust/2023-10-05/rust-std-1.73.0-armv7-unknown-freebsd.tar.xz) = 25389272
>-SHA256 (rust/2023-10-05/cargo-1.73.0-armv7-unknown-freebsd.tar.xz) = 5fb9a4202a2ba7e906939f13cf980bfc5ad8a6cb1ea753109825b93b9c8218d4
>-SIZE (rust/2023-10-05/cargo-1.73.0-armv7-unknown-freebsd.tar.xz) = 7874284
>-SHA256 (rust/2023-10-05/rustc-1.73.0-i686-unknown-freebsd.tar.xz) = 6ffe6f274d40278ed612326d2256753a9c946efe95784f9b45161d5b7140889c
>-SIZE (rust/2023-10-05/rustc-1.73.0-i686-unknown-freebsd.tar.xz) = 63833040
>-SHA256 (rust/2023-10-05/rust-std-1.73.0-i686-unknown-freebsd.tar.xz) = 4e955c639f12e3a21c14e2cedb2c1a2e66d6a6af21628b0801d6127d94524b45
>-SIZE (rust/2023-10-05/rust-std-1.73.0-i686-unknown-freebsd.tar.xz) = 26548660
>-SHA256 (rust/2023-10-05/cargo-1.73.0-i686-unknown-freebsd.tar.xz) = 865c042454bfdaea8aab6c6ccaceed69b92bcac31d23a54b0a3d31afc40db14b
>-SIZE (rust/2023-10-05/cargo-1.73.0-i686-unknown-freebsd.tar.xz) = 9110520
>-SHA256 (rust/2023-10-05/rustc-1.73.0-powerpc-unknown-freebsd.tar.xz) = 917a37b4a5a3f0a683b2ed37091e55a78cf3808df043a40cbfcbfc63546e329b
>-SIZE (rust/2023-10-05/rustc-1.73.0-powerpc-unknown-freebsd.tar.xz) = 63186932
>-SHA256 (rust/2023-10-05/rust-std-1.73.0-powerpc-unknown-freebsd.tar.xz) = d6e6946d291a4af061d3a65aee6fa3dda9fbba8ef0cb253e73a61f52474d75c2
>-SIZE (rust/2023-10-05/rust-std-1.73.0-powerpc-unknown-freebsd.tar.xz) = 24405696
>-SHA256 (rust/2023-10-05/cargo-1.73.0-powerpc-unknown-freebsd.tar.xz) = debb0eeaf22d4c7039395921a19359a6ed540c9acd461c3c4bb61e0b498c0ae8
>-SIZE (rust/2023-10-05/cargo-1.73.0-powerpc-unknown-freebsd.tar.xz) = 9012108
>-SHA256 (rust/2023-10-05/rustc-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 947ec0947529a223acf3a692a77bf529539708c991ba4798b0527a05b9524d95
>-SIZE (rust/2023-10-05/rustc-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 60934332
>-SHA256 (rust/2023-10-05/rust-std-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 682f2b8f780c778a5f3786beff82f2be78024cec9d267ba285267972cbcce2b7
>-SIZE (rust/2023-10-05/rust-std-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 24440160
>-SHA256 (rust/2023-10-05/cargo-1.73.0-powerpc64-unknown-freebsd.tar.xz) = ac66a7206e369ad9c4d7f4b515983b905d55133a3cd006766405832b00bce3af
>-SIZE (rust/2023-10-05/cargo-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 8622704
>-SHA256 (rust/2023-10-05/rustc-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 77d4dc0d889df6f7d2126b4fd9cd25b859b3879e55d55ac24947b42e59d2924b
>-SIZE (rust/2023-10-05/rustc-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 62706356
>-SHA256 (rust/2023-10-05/rust-std-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = a2351e3023ce34d439009ec2d2f9eae04f64e184ad62b04b1fa8bcfdc70f9d07
>-SIZE (rust/2023-10-05/rust-std-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 24539480
>-SHA256 (rust/2023-10-05/cargo-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 853085474edd0dbcfb2bc8b79564217595b162dc87c97322e20370f4ce462167
>-SIZE (rust/2023-10-05/cargo-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 8845024
>-SHA256 (rust/2023-10-05/rustc-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = a79a9691e1a26e627a4ef963e94b08eecf4f91ff5d63329aa76a6f9add9d2bfc
>-SIZE (rust/2023-10-05/rustc-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = 72704312
>-SHA256 (rust/2023-10-05/rust-std-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = a85c4670d5d9c4d0ccfe2dbf366f227597c65c2b88fdb11a36991345cbe5e194
>-SIZE (rust/2023-10-05/rust-std-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = 24553484
>-SHA256 (rust/2023-10-05/cargo-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = 5d35edc0a333903844be52075020aedfe5de06ec1af96d35ff327536a25bc6c6
>-SIZE (rust/2023-10-05/cargo-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = 11004428
>+TIMESTAMP = 1703234389
>+SHA256 (rust/rustc-1.75.0-src.tar.xz) = 4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340
>+SIZE (rust/rustc-1.75.0-src.tar.xz) = 159624388
>+SHA256 (rust/2023-11-16/rustc-1.74.0-aarch64-unknown-freebsd.tar.xz) = fe01779b2d6c78425213f2c019999da38465ecbcf1fa2ae0be4830054c8aafaa
>+SIZE (rust/2023-11-16/rustc-1.74.0-aarch64-unknown-freebsd.tar.xz) = 56893376
>+SHA256 (rust/2023-11-16/rust-std-1.74.0-aarch64-unknown-freebsd.tar.xz) = cd227beb38185dea4194f3e1801d91c2f7a74ec5846b9aacf64d62bcc515558f
>+SIZE (rust/2023-11-16/rust-std-1.74.0-aarch64-unknown-freebsd.tar.xz) = 25388508
>+SHA256 (rust/2023-11-16/cargo-1.74.0-aarch64-unknown-freebsd.tar.xz) = b87baaa92fa634b0e251c75fc4d1f8028d002022871e021d0c1823024ac3f354
>+SIZE (rust/2023-11-16/cargo-1.74.0-aarch64-unknown-freebsd.tar.xz) = 8380592
>+SHA256 (rust/2023-11-16/rustc-1.74.0-x86_64-unknown-freebsd.tar.xz) = fcd04fc6528fd00df91f702d7bbe58d7c85c27120ef6198d60ed8ba8f86934d7
>+SIZE (rust/2023-11-16/rustc-1.74.0-x86_64-unknown-freebsd.tar.xz) = 45919420
>+SHA256 (rust/2023-11-16/rust-std-1.74.0-x86_64-unknown-freebsd.tar.xz) = ed498ff7be7726ab51f24f966a108db6670cc6a9bdb7f14a33220ef5198d4d63
>+SIZE (rust/2023-11-16/rust-std-1.74.0-x86_64-unknown-freebsd.tar.xz) = 25975848
>+SHA256 (rust/2023-11-16/cargo-1.74.0-x86_64-unknown-freebsd.tar.xz) = f2f05af65bf3e095ecf5c1f54c2cc4ea7fecb9d5f908b79b3fe5888503560076
>+SIZE (rust/2023-11-16/cargo-1.74.0-x86_64-unknown-freebsd.tar.xz) = 9220016
>+SHA256 (rust/2023-11-16/rustc-1.74.0-armv7-unknown-freebsd.tar.xz) = 9ea6c6f148e17ecb71a33ef7b98a764e1b53b5859cac0c5e719a04890252a07b
>+SIZE (rust/2023-11-16/rustc-1.74.0-armv7-unknown-freebsd.tar.xz) = 56925484
>+SHA256 (rust/2023-11-16/rust-std-1.74.0-armv7-unknown-freebsd.tar.xz) = 964dbcf7e58f00991e198b92ca157078a56fd41d09a22b6742942515d700660a
>+SIZE (rust/2023-11-16/rust-std-1.74.0-armv7-unknown-freebsd.tar.xz) = 24752972
>+SHA256 (rust/2023-11-16/cargo-1.74.0-armv7-unknown-freebsd.tar.xz) = 7870e633a5d5881a985db77b9b9db8fe4547ce6f0dadaeeec3ea12b8128c5876
>+SIZE (rust/2023-11-16/cargo-1.74.0-armv7-unknown-freebsd.tar.xz) = 8279660
>+SHA256 (rust/2023-11-16/rustc-1.74.0-i686-unknown-freebsd.tar.xz) = be102a4d208eb37327a2449b3037888a7d950dad81107acf2d9b7e4def6ce7eb
>+SIZE (rust/2023-11-16/rustc-1.74.0-i686-unknown-freebsd.tar.xz) = 63690404
>+SHA256 (rust/2023-11-16/rust-std-1.74.0-i686-unknown-freebsd.tar.xz) = da05b3990663fd58100fec56dbc8c18136c9d3d3b6ed2103dc70f741c8b77fbe
>+SIZE (rust/2023-11-16/rust-std-1.74.0-i686-unknown-freebsd.tar.xz) = 25888756
>+SHA256 (rust/2023-11-16/cargo-1.74.0-i686-unknown-freebsd.tar.xz) = 320242c8962b2f3637673a4cccce0177377de6e2c00745b8241ac45a572ba121
>+SIZE (rust/2023-11-16/cargo-1.74.0-i686-unknown-freebsd.tar.xz) = 9560444
>+SHA256 (rust/2023-11-16/rustc-1.74.0-powerpc-unknown-freebsd.tar.xz) = b9cb8ddeff8a35c3f2ac09cf2247ddd728845dc4b84107c5eb15196f67f37f89
>+SIZE (rust/2023-11-16/rustc-1.74.0-powerpc-unknown-freebsd.tar.xz) = 63153412
>+SHA256 (rust/2023-11-16/rust-std-1.74.0-powerpc-unknown-freebsd.tar.xz) = 4a4084056182a224cbaf48dc76509b33dcb4d855253b5fa1c017b51d0d81d20f
>+SIZE (rust/2023-11-16/rust-std-1.74.0-powerpc-unknown-freebsd.tar.xz) = 23776296
>+SHA256 (rust/2023-11-16/cargo-1.74.0-powerpc-unknown-freebsd.tar.xz) = fb3da81351c04fd71559ffca1e971a216f52cb2a15354a9c454809e108dbb2bf
>+SIZE (rust/2023-11-16/cargo-1.74.0-powerpc-unknown-freebsd.tar.xz) = 9989564
>+SHA256 (rust/2023-11-16/rustc-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 2391abc91392f95bf4cee84a83d511723c0ac92971b64061450172011b7579b0
>+SIZE (rust/2023-11-16/rustc-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 60695088
>+SHA256 (rust/2023-11-16/rust-std-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 3cab1582e1aee6ee0c2e4ef1095c0f4e44b7b4db24ee2a8f5fdd1a0763dc69b2
>+SIZE (rust/2023-11-16/rust-std-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 23815204
>+SHA256 (rust/2023-11-16/cargo-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 201b2fce30fd67080c86542895f456ca1e0191e98c1d03f6b3063887b1c70f84
>+SIZE (rust/2023-11-16/cargo-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 9490336
>+SHA256 (rust/2023-11-16/rustc-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = bfd17eb45e715e7d567b624b12976bab745761499bf6f6bd0affbdef625af6b9
>+SIZE (rust/2023-11-16/rustc-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 62511012
>+SHA256 (rust/2023-11-16/rust-std-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 5f777a1570fd5560b108d64abcb610ecbd7fc67452c3eb5d29300f3d84b2aba1
>+SIZE (rust/2023-11-16/rust-std-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 23935072
>+SHA256 (rust/2023-11-16/cargo-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 61c69c43e37c46f1730f6c0d490f043d5170e95c3183bb9297343a849799fb30
>+SIZE (rust/2023-11-16/cargo-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 9745192
>+SHA256 (rust/2023-11-16/rustc-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = ece9e09e255e0018b807b3d8daae875ae562cdb82b97944ada8266b590e882fe
>+SIZE (rust/2023-11-16/rustc-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 72605232
>+SHA256 (rust/2023-11-16/rust-std-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 163dc2e3588be65bb4575c40218d98a8638d9615401392ad9f708fc98ef2d9c7
>+SIZE (rust/2023-11-16/rust-std-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 23923712
>+SHA256 (rust/2023-11-16/cargo-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 50e0b763ed2a37dee3befad3b8ad2b32449b49228dd4f299b3602eb034cb9201
>+SIZE (rust/2023-11-16/cargo-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 12095040
>diff --git a/lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs b/lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
>deleted file mode 100644
>index 0bbcd7b0f7..0000000000
>--- a/lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- compiler/rustc_target/src/spec/i686_unknown_freebsd.rs.orig	2020-01-23 19:40:44 UTC
>-+++ compiler/rustc_target/src/spec/i686_unknown_freebsd.rs
>-@@ -2,7 +2,7 @@ pub fn target() -> Target {
>- 
>- pub fn target() -> Target {
>-     let mut base = super::freebsd_base::opts();
>--    base.cpu = "pentium4".into();
>-+    base.cpu = "pentiumpro".into();
>-     base.max_atomic_width = Some(64);
>-     let pre_link_args = base.pre_link_args.entry(LinkerFlavor::Gcc).or_default();
>-     pre_link_args.push("-m32".into());
>diff --git a/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs b/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs
>new file mode 100644
>index 0000000000..45d4791333
>--- /dev/null
>+++ b/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs
>@@ -0,0 +1,13 @@
>+i386 should be pentiumpro (no SSE2, no ...)
>+
>+--- compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs.orig	2023-12-22 11:18:00 UTC
>++++ compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs
>+@@ -2,7 +2,7 @@ pub fn target() -> Target {
>+ 
>+ pub fn target() -> Target {
>+     let mut base = base::freebsd::opts();
>+-    base.cpu = "pentium4".into();
>++    base.cpu = "pentiumpro".into();
>+     base.max_atomic_width = Some(64);
>+     base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32", "-Wl,-znotext"]);
>+     base.stack_probes = StackProbeType::X86;
>diff --git a/lang/rust/files/patch-src_bootstrap_install.rs b/lang/rust/files/patch-src_bootstrap_src_core_build__steps_install.rs
>similarity index 81%
>rename from lang/rust/files/patch-src_bootstrap_install.rs
>rename to lang/rust/files/patch-src_bootstrap_src_core_build__steps_install.rs
>index e3afe8bad0..6d7f6d6124 100644
>--- a/lang/rust/files/patch-src_bootstrap_install.rs
>+++ b/lang/rust/files/patch-src_bootstrap_src_core_build__steps_install.rs
>@@ -4,8 +4,8 @@ It otherwise wastes significant time (there are a lot of individual
> files) and stages host docs, wasm docs, which unstages the host
> docs first.
> 
>---- src/bootstrap/install.rs.orig	2022-05-01 20:28:31 UTC
>-+++ src/bootstrap/install.rs
>+--- src/bootstrap/src/core/build_steps/install.rs.orig	2022-05-01 20:28:31 UTC
>++++ src/bootstrap/src/core/build_steps/install.rs
> @@ -138,7 +138,7 @@ macro_rules! install {
>  }
>  
>diff --git a/lang/rust/files/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs b/lang/rust/patch-compiler_rustc__target_src_spec_targets_powerpc64__unknown__freebsd.rs
>similarity index 71%
>rename from lang/rust/files/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs
>rename to lang/rust/patch-compiler_rustc__target_src_spec_targets_powerpc64__unknown__freebsd.rs
>index 22b0f628da..552af393ce 100644
>--- a/lang/rust/files/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs
>+++ b/lang/rust/patch-compiler_rustc__target_src_spec_targets_powerpc64__unknown__freebsd.rs
>@@ -1,5 +1,5 @@
>---- compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs.orig	2020-12-29 04:03:08 UTC
>-+++ compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs
>+--- compiler/rustc_target/src/spec/targets/powerpc64_unknown_freebsd.rs.orig	2020-12-29 04:03:08 UTC
>++++ compiler/rustc_target/src/spec/targets/powerpc64_unknown_freebsd.rs
> @@ -12,6 +12,10 @@ pub fn target() -> Target {
>          pointer_width: 64,
>          data_layout: "E-m:e-i64:64-n32:64".into(),
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 276033: 247371 | 247372 | 247420