Attachment #248281 for bug #276920

View | Details | Raw Unified | Return to bug 276920
Collapse All | Expand All

Lines 97-103 WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} Link Here

(-)b/Mk/Uses/cargo.mk (-1 / +1 lines)
97		97
98	CARGO_BUILDDEP?= yes	98	CARGO_BUILDDEP?= yes
99	. if ${CARGO_BUILDDEP:tl} == "yes"	99	. if ${CARGO_BUILDDEP:tl} == "yes"
100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.75.0:lang/${RUST_DEFAULT}	100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.76.0:lang/${RUST_DEFAULT}
101	. elif ${CARGO_BUILDDEP:tl} == "any-version"	101	. elif ${CARGO_BUILDDEP:tl} == "any-version"
102	BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}	102	BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
103	. endif	103	. endif

Lines 74-80 BINARY_ALIAS+= python3=${PYTHON_CMD} Link Here

(-)b/Mk/bsd.gecko.mk (-1 / +1 lines)
74	BUNDLE_LIBS= yes	74	BUNDLE_LIBS= yes
75		75
76	BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \	76	BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \
77	${RUST_DEFAULT}>=1.75.0:lang/${RUST_DEFAULT} \	77	${RUST_DEFAULT}>=1.76.0:lang/${RUST_DEFAULT} \
78	node:www/node	78	node:www/node
79	LIB_DEPENDS+= libdrm.so:graphics/libdrm	79	LIB_DEPENDS+= libdrm.so:graphics/libdrm
80	RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci	80	RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci

Lines 2-8 Link Here

(-)b/lang/rust-bootstrap/Makefile (-1 / +1 lines)
2	# to upload them to ~/public_distfiles on freefall in preparation	2	# to upload them to ~/public_distfiles on freefall in preparation
3	# for the next lang/rust update.	3	# for the next lang/rust update.
4	PORTNAME= rust	4	PORTNAME= rust
5	PORTVERSION= 1.75.0	5	PORTVERSION= 1.76.0
6	CATEGORIES= lang	6	CATEGORIES= lang
7	MASTER_SITES= https://static.rust-lang.org/dist/	7	MASTER_SITES= https://static.rust-lang.org/dist/
8	PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-	8	PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-

Lines 1-3 Link Here

(-)b/lang/rust-bootstrap/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1703234390	1	TIMESTAMP = 1707409055
2	SHA256 (rust/rustc-1.75.0-src.tar.xz) = 4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340	2	SHA256 (rust/rustc-1.76.0-src.tar.xz) = 805482b436442a6786d270cacbab8f00529e06141b27b7fb01909b97ce4f3464
3	SIZE (rust/rustc-1.75.0-src.tar.xz) = 159624388	3	SIZE (rust/rustc-1.76.0-src.tar.xz) = 162267908




PORTNAME=	rust
PORTVERSION?=	1.76.0
PORTREVISION?=	0
CATEGORIES=	lang
MASTER_SITES=	https://static.rust-lang.org/dist/:src \

			_RUST_TARGETS+=wasm32-unknown-unknown

# See WRKSRC/src/stage0.json for the date and version values
BOOTSTRAPS_DATE?=		2023-12-28
RUST_BOOTSTRAP_VERSION?=	1.75.0

CARGO_VENDOR_DIR?=		${WRKSRC}/vendor


_COMPONENTS+=	rust-docs-${_PACKAGE_VERS}-wasm32-unknown-unknown rust-docs-json-${_PACKAGE_VERS}-wasm32-unknown-unknown
.endif

# If the kernel does not return sane kern.proc.pathname values
# for hardlinks then disable hardlinks in the build to avoid
# intermittent "can't find crate for `std`" build failures,
# c.f. PR248184
#
# XXX: Avoiding OSVERSION since it is derived from userland but
# the running kernel might still be newer with sane behavior
# anyway...
.if exists(${PATCHDIR}/no-hardlinks)
_KERN_OSRELDATE!=	${SYSCTL} -n kern.osreldate 2>/dev/null || echo 0
.  if ${_KERN_OSRELDATE} < 1300521
EXTRA_PATCHES+=		${PATCHDIR}/no-hardlinks
.  endif
.endif

.ifdef QEMU_EMULATING
IGNORE=	fails to build with qemu-user-static
.endif




TIMESTAMP = 1707409054
SHA256 (rust/rustc-1.76.0-src.tar.xz) = 805482b436442a6786d270cacbab8f00529e06141b27b7fb01909b97ce4f3464
SIZE (rust/rustc-1.76.0-src.tar.xz) = 162267908
SHA256 (rust/2023-12-28/rustc-1.75.0-aarch64-unknown-freebsd.tar.xz) = d7a896745b510085cbb9935d1853fea3d87989a69fa7f4b52c581434d8f1f58e
SIZE (rust/2023-12-28/rustc-1.75.0-aarch64-unknown-freebsd.tar.xz) = 56442784
SHA256 (rust/2023-12-28/rust-std-1.75.0-aarch64-unknown-freebsd.tar.xz) = 99de222255290e1b15fa9b50517c747122b424115ddbeb6c0ca401952429a826
SIZE (rust/2023-12-28/rust-std-1.75.0-aarch64-unknown-freebsd.tar.xz) = 24948104
SHA256 (rust/2023-12-28/cargo-1.75.0-aarch64-unknown-freebsd.tar.xz) = cb2387f4c6f71922d0683bbd2d8012da5f43f4aae8d9d510399d82b145b9e414
SIZE (rust/2023-12-28/cargo-1.75.0-aarch64-unknown-freebsd.tar.xz) = 8172316
SHA256 (rust/2023-12-28/rustc-1.75.0-x86_64-unknown-freebsd.tar.xz) = dd765ded0541027d8803d5f5b5d9948fff1819d45e73ecbc04c56968b9ca06ad
SIZE (rust/2023-12-28/rustc-1.75.0-x86_64-unknown-freebsd.tar.xz) = 45474452
SHA256 (rust/2023-12-28/rust-std-1.75.0-x86_64-unknown-freebsd.tar.xz) = 7bc35d9286ba14c050f65d6cf6253a018d64d47bae62f6502bddcaf3078602ba
SIZE (rust/2023-12-28/rust-std-1.75.0-x86_64-unknown-freebsd.tar.xz) = 25567132
SHA256 (rust/2023-12-28/cargo-1.75.0-x86_64-unknown-freebsd.tar.xz) = 6d6bc069f0fa25980be5d3654f49209e920b8bb0f1396031aef29c290b93c7ea
SIZE (rust/2023-12-28/cargo-1.75.0-x86_64-unknown-freebsd.tar.xz) = 9030472
SHA256 (rust/2023-12-28/rustc-1.75.0-armv7-unknown-freebsd.tar.xz) = 6e64be8554f9aea7abdb0f1d512c6948347eaf03b416dc2a85b91a772668d844
SIZE (rust/2023-12-28/rustc-1.75.0-armv7-unknown-freebsd.tar.xz) = 56720164
SHA256 (rust/2023-12-28/rust-std-1.75.0-armv7-unknown-freebsd.tar.xz) = d8d8eead83421b248fbf1bb272cf4df9dfadd1bbf6263a67e4688e1645532b0e
SIZE (rust/2023-12-28/rust-std-1.75.0-armv7-unknown-freebsd.tar.xz) = 24335228
SHA256 (rust/2023-12-28/cargo-1.75.0-armv7-unknown-freebsd.tar.xz) = 36b819cf9667f21dfc82fa4542c14939d45bdbe10076624e2ffd7a1a6172d304
SIZE (rust/2023-12-28/cargo-1.75.0-armv7-unknown-freebsd.tar.xz) = 8172896
SHA256 (rust/2023-12-28/rustc-1.75.0-i686-unknown-freebsd.tar.xz) = 565f838b5c7d746ac390c241e2bc0cc70c5fcbc4de409d17ee4a24c883464bae
SIZE (rust/2023-12-28/rustc-1.75.0-i686-unknown-freebsd.tar.xz) = 63297584
SHA256 (rust/2023-12-28/rust-std-1.75.0-i686-unknown-freebsd.tar.xz) = a6d33d5382d5e08307bad99cdaac2efc122b859a040cc59d6bd2d4154964fe86
SIZE (rust/2023-12-28/rust-std-1.75.0-i686-unknown-freebsd.tar.xz) = 25503984
SHA256 (rust/2023-12-28/cargo-1.75.0-i686-unknown-freebsd.tar.xz) = 328f8103af3edf70a64740203ebe7fcd01096cb5a75b13c73f14cc847093332f
SIZE (rust/2023-12-28/cargo-1.75.0-i686-unknown-freebsd.tar.xz) = 9406204
SHA256 (rust/2023-12-28/rustc-1.75.0-powerpc-unknown-freebsd.tar.xz) = cc6cfc7bf3e2c97b69352d3b44d39de05d20642b28cee4618be062c3d8b62595
SIZE (rust/2023-12-28/rustc-1.75.0-powerpc-unknown-freebsd.tar.xz) = 60967708
SHA256 (rust/2023-12-28/rust-std-1.75.0-powerpc-unknown-freebsd.tar.xz) = 602db9f267735f2d56d7bed535f5c45af33ceb87a6b4c52b97c4f72653db2a9e
SIZE (rust/2023-12-28/rust-std-1.75.0-powerpc-unknown-freebsd.tar.xz) = 23475244
SHA256 (rust/2023-12-28/cargo-1.75.0-powerpc-unknown-freebsd.tar.xz) = 4d2e6a1f0029960aa203fae360c0ab3a486fdb2fae900c6c8509539c0a1319d2
SIZE (rust/2023-12-28/cargo-1.75.0-powerpc-unknown-freebsd.tar.xz) = 9383356
SHA256 (rust/2023-12-28/rustc-1.75.0-powerpc64-unknown-freebsd.tar.xz) = 150f8e1adced452caae1f9e964b674ce9857be5c0a45dfeed29cac57129d5ef8
SIZE (rust/2023-12-28/rustc-1.75.0-powerpc64-unknown-freebsd.tar.xz) = 59768944
SHA256 (rust/2023-12-28/rust-std-1.75.0-powerpc64-unknown-freebsd.tar.xz) = f650a305a601f8ee0d4f190f793099767b102a6588e12e96c13b1d4e337d2299
SIZE (rust/2023-12-28/rust-std-1.75.0-powerpc64-unknown-freebsd.tar.xz) = 23461800
SHA256 (rust/2023-12-28/cargo-1.75.0-powerpc64-unknown-freebsd.tar.xz) = e96e442b6febce9285d9d0b1440c32a102327e1c72a4c4443a22161fccd85486
SIZE (rust/2023-12-28/cargo-1.75.0-powerpc64-unknown-freebsd.tar.xz) = 9050496
SHA256 (rust/2023-12-28/rustc-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 4ecc932c1a5e31aeda8965d6c7cc62685a570d5f79602d40db9fc8d3ccc74c5b
SIZE (rust/2023-12-28/rustc-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 61505160
SHA256 (rust/2023-12-28/rust-std-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 90d5b3b237406be47213d23c0300ddb6c38a2fea7a13018f2c0f4abf90078851
SIZE (rust/2023-12-28/rust-std-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 23606636
SHA256 (rust/2023-12-28/cargo-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 17e65d013ccfbc126756bf3d11df0e8378f3850ff3485d37efdbea398db1910d
SIZE (rust/2023-12-28/cargo-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 9345472
SHA256 (rust/2023-12-28/rustc-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = b37f32501f83c4cb5fd3b35334c3198802be3cacccfcc1812049de65a369f3b8
SIZE (rust/2023-12-28/rustc-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = 71656164
SHA256 (rust/2023-12-28/rust-std-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = c31ac0ea1a25517b3162191e01cd2c9033740fa9dd7d1697b75d9f1165cc2965
SIZE (rust/2023-12-28/rust-std-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = 23575792
SHA256 (rust/2023-12-28/cargo-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = 6a64c7c06b18514d9abdc9aa4e86f8db8b884481ea6c7540f899336db45c0d4a
SIZE (rust/2023-12-28/cargo-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = 11699372




Attempt to fix intermittent "can't find crate for `std`" build failures

The location of rustc (found via env::current_exe()) is used to
find the right libstd.  However it might have been "copied" by
creating a hard link to the new location instead.  Like /proc/curproc/file,
KERN_PROC_PATHNAME (used internally by current_exe()) can return
any of the file's multiple paths.  Most of the time it returns the
right rustc path and the build will succeed but occasionally it
will return the "wrong" path and the build fails with:

    error[E0463]: can't find crate for `std`

If this is right a viable workaround should be to never create hard
links during the build, so let's try that.

--- src/bootstrap/lib.rs.orig	2020-07-23 20:16:43 UTC
+++ src/bootstrap/lib.rs
@@ -1450,19 +1450,13 @@ impl Build {
                 return;
             }
         }
-        if let Ok(()) = fs::hard_link(&src, dst) {
-            // Attempt to "easy copy" by creating a hard link
-            // (symlinks don't work on windows), but if that fails
-            // just fall back to a slow `copy` operation.
-        } else {
-            if let Err(e) = fs::copy(&src, dst) {
-                panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
-            }
-            t!(fs::set_permissions(dst, metadata.permissions()));
-            let atime = FileTime::from_last_access_time(&metadata);
-            let mtime = FileTime::from_last_modification_time(&metadata);
-            t!(filetime::set_file_times(dst, atime, mtime));
+        if let Err(e) = fs::copy(&src, dst) {
+            panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
         }
+        t!(fs::set_permissions(dst, metadata.permissions()));
+        let atime = FileTime::from_last_access_time(&metadata);
+        let mtime = FileTime::from_last_modification_time(&metadata);
+        t!(filetime::set_file_times(dst, atime, mtime));
     }
 
     /// Copies the `src` directory recursively to `dst`. Both are assumed to exist





--- src/tools/cargo/src/cargo/sources/git/source.rs.orig	2021-10-04 20:59:57 UTC
+++ src/tools/cargo/src/cargo/sources/git/source.rs
@@ -205,6 +205,9 @@ impl<'cfg> Source for GitSource<'cfg> {
         kind: QueryKind,
         f: &mut dyn FnMut(IndexSummary),
     ) -> Poll<CargoResult<()>> {
+        if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
+            return Poll::Ready(Ok(()));

         if let Some(src) = self.path_source.as_mut() {
             src.query(dep, kind, f)
         } else {
@@ -228,6 +231,10 @@ impl<'cfg> Source for GitSource<'cfg> {
 
     fn block_until_ready(&mut self) -> CargoResult<()> {
         if self.path_source.is_some() {
             self.mark_used(None)?;
             return Ok(());
+        }
+
+        if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
+             return Ok(());
         }
 
         let git_fs = self.config.git_path();

Return to bug 276920

Lines 1-5 Link Here

(-)b/lang/rust/Makefile (-18 / +3 lines)
1	PORTNAME= rust	1	PORTNAME= rust
2	PORTVERSION?= 1.75.0	2	PORTVERSION?= 1.76.0
3	PORTREVISION?= 0	3	PORTREVISION?= 0
4	CATEGORIES= lang	4	CATEGORIES= lang
5	MASTER_SITES= https://static.rust-lang.org/dist/:src \	5	MASTER_SITES= https://static.rust-lang.org/dist/:src \
Lines 68-75 WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown Link Here
68	_RUST_TARGETS+=wasm32-unknown-unknown	68	_RUST_TARGETS+=wasm32-unknown-unknown
69		69
70	# See WRKSRC/src/stage0.json for the date and version values	70	# See WRKSRC/src/stage0.json for the date and version values
71	BOOTSTRAPS_DATE?= 2023-11-16	71	BOOTSTRAPS_DATE?= 2023-12-28
72	RUST_BOOTSTRAP_VERSION?= 1.74.0	72	RUST_BOOTSTRAP_VERSION?= 1.75.0
73		73
74	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor	74	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
75		75
Lines 123-143 _COMPONENTS+= rustc-dev-${_PACKAGE_VERS}-${_RUST_TARGET} Link Here
123	_COMPONENTS+= rust-docs-${_PACKAGE_VERS}-wasm32-unknown-unknown rust-docs-json-${_PACKAGE_VERS}-wasm32-unknown-unknown	123	_COMPONENTS+= rust-docs-${_PACKAGE_VERS}-wasm32-unknown-unknown rust-docs-json-${_PACKAGE_VERS}-wasm32-unknown-unknown
124	.endif	124	.endif
125		125
126	# If the kernel does not return sane kern.proc.pathname values
127	# for hardlinks then disable hardlinks in the build to avoid
128	# intermittent "can't find crate for `std`" build failures,
129	# c.f. PR248184
130	#
131	# XXX: Avoiding OSVERSION since it is derived from userland but
132	# the running kernel might still be newer with sane behavior
133	# anyway...
134	.if exists(${PATCHDIR}/no-hardlinks)
135	_KERN_OSRELDATE!= ${SYSCTL} -n kern.osreldate 2>/dev/null \|\| echo 0
136	. if ${_KERN_OSRELDATE} < 1300521
137	EXTRA_PATCHES+= ${PATCHDIR}/no-hardlinks
138	. endif
139	.endif
140
141	.ifdef QEMU_EMULATING	126	.ifdef QEMU_EMULATING
142	IGNORE= fails to build with qemu-user-static	127	IGNORE= fails to build with qemu-user-static
143	.endif	128	.endif

Lines 1-51 Link Here

(-)b/lang/rust/distinfo (-51 / +51 lines)
1	TIMESTAMP = 1703234389	1	TIMESTAMP = 1707409054
2	SHA256 (rust/rustc-1.75.0-src.tar.xz) = 4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340	2	SHA256 (rust/rustc-1.76.0-src.tar.xz) = 805482b436442a6786d270cacbab8f00529e06141b27b7fb01909b97ce4f3464
3	SIZE (rust/rustc-1.75.0-src.tar.xz) = 159624388	3	SIZE (rust/rustc-1.76.0-src.tar.xz) = 162267908
4	SHA256 (rust/2023-11-16/rustc-1.74.0-aarch64-unknown-freebsd.tar.xz) = fe01779b2d6c78425213f2c019999da38465ecbcf1fa2ae0be4830054c8aafaa	4	SHA256 (rust/2023-12-28/rustc-1.75.0-aarch64-unknown-freebsd.tar.xz) = d7a896745b510085cbb9935d1853fea3d87989a69fa7f4b52c581434d8f1f58e
5	SIZE (rust/2023-11-16/rustc-1.74.0-aarch64-unknown-freebsd.tar.xz) = 56893376	5	SIZE (rust/2023-12-28/rustc-1.75.0-aarch64-unknown-freebsd.tar.xz) = 56442784
6	SHA256 (rust/2023-11-16/rust-std-1.74.0-aarch64-unknown-freebsd.tar.xz) = cd227beb38185dea4194f3e1801d91c2f7a74ec5846b9aacf64d62bcc515558f	6	SHA256 (rust/2023-12-28/rust-std-1.75.0-aarch64-unknown-freebsd.tar.xz) = 99de222255290e1b15fa9b50517c747122b424115ddbeb6c0ca401952429a826
7	SIZE (rust/2023-11-16/rust-std-1.74.0-aarch64-unknown-freebsd.tar.xz) = 25388508	7	SIZE (rust/2023-12-28/rust-std-1.75.0-aarch64-unknown-freebsd.tar.xz) = 24948104
8	SHA256 (rust/2023-11-16/cargo-1.74.0-aarch64-unknown-freebsd.tar.xz) = b87baaa92fa634b0e251c75fc4d1f8028d002022871e021d0c1823024ac3f354	8	SHA256 (rust/2023-12-28/cargo-1.75.0-aarch64-unknown-freebsd.tar.xz) = cb2387f4c6f71922d0683bbd2d8012da5f43f4aae8d9d510399d82b145b9e414
9	SIZE (rust/2023-11-16/cargo-1.74.0-aarch64-unknown-freebsd.tar.xz) = 8380592	9	SIZE (rust/2023-12-28/cargo-1.75.0-aarch64-unknown-freebsd.tar.xz) = 8172316
10	SHA256 (rust/2023-11-16/rustc-1.74.0-x86_64-unknown-freebsd.tar.xz) = fcd04fc6528fd00df91f702d7bbe58d7c85c27120ef6198d60ed8ba8f86934d7	10	SHA256 (rust/2023-12-28/rustc-1.75.0-x86_64-unknown-freebsd.tar.xz) = dd765ded0541027d8803d5f5b5d9948fff1819d45e73ecbc04c56968b9ca06ad
11	SIZE (rust/2023-11-16/rustc-1.74.0-x86_64-unknown-freebsd.tar.xz) = 45919420	11	SIZE (rust/2023-12-28/rustc-1.75.0-x86_64-unknown-freebsd.tar.xz) = 45474452
12	SHA256 (rust/2023-11-16/rust-std-1.74.0-x86_64-unknown-freebsd.tar.xz) = ed498ff7be7726ab51f24f966a108db6670cc6a9bdb7f14a33220ef5198d4d63	12	SHA256 (rust/2023-12-28/rust-std-1.75.0-x86_64-unknown-freebsd.tar.xz) = 7bc35d9286ba14c050f65d6cf6253a018d64d47bae62f6502bddcaf3078602ba
13	SIZE (rust/2023-11-16/rust-std-1.74.0-x86_64-unknown-freebsd.tar.xz) = 25975848	13	SIZE (rust/2023-12-28/rust-std-1.75.0-x86_64-unknown-freebsd.tar.xz) = 25567132
14	SHA256 (rust/2023-11-16/cargo-1.74.0-x86_64-unknown-freebsd.tar.xz) = f2f05af65bf3e095ecf5c1f54c2cc4ea7fecb9d5f908b79b3fe5888503560076	14	SHA256 (rust/2023-12-28/cargo-1.75.0-x86_64-unknown-freebsd.tar.xz) = 6d6bc069f0fa25980be5d3654f49209e920b8bb0f1396031aef29c290b93c7ea
15	SIZE (rust/2023-11-16/cargo-1.74.0-x86_64-unknown-freebsd.tar.xz) = 9220016	15	SIZE (rust/2023-12-28/cargo-1.75.0-x86_64-unknown-freebsd.tar.xz) = 9030472
16	SHA256 (rust/2023-11-16/rustc-1.74.0-armv7-unknown-freebsd.tar.xz) = 9ea6c6f148e17ecb71a33ef7b98a764e1b53b5859cac0c5e719a04890252a07b	16	SHA256 (rust/2023-12-28/rustc-1.75.0-armv7-unknown-freebsd.tar.xz) = 6e64be8554f9aea7abdb0f1d512c6948347eaf03b416dc2a85b91a772668d844
17	SIZE (rust/2023-11-16/rustc-1.74.0-armv7-unknown-freebsd.tar.xz) = 56925484	17	SIZE (rust/2023-12-28/rustc-1.75.0-armv7-unknown-freebsd.tar.xz) = 56720164
18	SHA256 (rust/2023-11-16/rust-std-1.74.0-armv7-unknown-freebsd.tar.xz) = 964dbcf7e58f00991e198b92ca157078a56fd41d09a22b6742942515d700660a	18	SHA256 (rust/2023-12-28/rust-std-1.75.0-armv7-unknown-freebsd.tar.xz) = d8d8eead83421b248fbf1bb272cf4df9dfadd1bbf6263a67e4688e1645532b0e
19	SIZE (rust/2023-11-16/rust-std-1.74.0-armv7-unknown-freebsd.tar.xz) = 24752972	19	SIZE (rust/2023-12-28/rust-std-1.75.0-armv7-unknown-freebsd.tar.xz) = 24335228
20	SHA256 (rust/2023-11-16/cargo-1.74.0-armv7-unknown-freebsd.tar.xz) = 7870e633a5d5881a985db77b9b9db8fe4547ce6f0dadaeeec3ea12b8128c5876	20	SHA256 (rust/2023-12-28/cargo-1.75.0-armv7-unknown-freebsd.tar.xz) = 36b819cf9667f21dfc82fa4542c14939d45bdbe10076624e2ffd7a1a6172d304
21	SIZE (rust/2023-11-16/cargo-1.74.0-armv7-unknown-freebsd.tar.xz) = 8279660	21	SIZE (rust/2023-12-28/cargo-1.75.0-armv7-unknown-freebsd.tar.xz) = 8172896
22	SHA256 (rust/2023-11-16/rustc-1.74.0-i686-unknown-freebsd.tar.xz) = be102a4d208eb37327a2449b3037888a7d950dad81107acf2d9b7e4def6ce7eb	22	SHA256 (rust/2023-12-28/rustc-1.75.0-i686-unknown-freebsd.tar.xz) = 565f838b5c7d746ac390c241e2bc0cc70c5fcbc4de409d17ee4a24c883464bae
23	SIZE (rust/2023-11-16/rustc-1.74.0-i686-unknown-freebsd.tar.xz) = 63690404	23	SIZE (rust/2023-12-28/rustc-1.75.0-i686-unknown-freebsd.tar.xz) = 63297584
24	SHA256 (rust/2023-11-16/rust-std-1.74.0-i686-unknown-freebsd.tar.xz) = da05b3990663fd58100fec56dbc8c18136c9d3d3b6ed2103dc70f741c8b77fbe	24	SHA256 (rust/2023-12-28/rust-std-1.75.0-i686-unknown-freebsd.tar.xz) = a6d33d5382d5e08307bad99cdaac2efc122b859a040cc59d6bd2d4154964fe86
25	SIZE (rust/2023-11-16/rust-std-1.74.0-i686-unknown-freebsd.tar.xz) = 25888756	25	SIZE (rust/2023-12-28/rust-std-1.75.0-i686-unknown-freebsd.tar.xz) = 25503984
26	SHA256 (rust/2023-11-16/cargo-1.74.0-i686-unknown-freebsd.tar.xz) = 320242c8962b2f3637673a4cccce0177377de6e2c00745b8241ac45a572ba121	26	SHA256 (rust/2023-12-28/cargo-1.75.0-i686-unknown-freebsd.tar.xz) = 328f8103af3edf70a64740203ebe7fcd01096cb5a75b13c73f14cc847093332f
27	SIZE (rust/2023-11-16/cargo-1.74.0-i686-unknown-freebsd.tar.xz) = 9560444	27	SIZE (rust/2023-12-28/cargo-1.75.0-i686-unknown-freebsd.tar.xz) = 9406204
28	SHA256 (rust/2023-11-16/rustc-1.74.0-powerpc-unknown-freebsd.tar.xz) = b9cb8ddeff8a35c3f2ac09cf2247ddd728845dc4b84107c5eb15196f67f37f89	28	SHA256 (rust/2023-12-28/rustc-1.75.0-powerpc-unknown-freebsd.tar.xz) = cc6cfc7bf3e2c97b69352d3b44d39de05d20642b28cee4618be062c3d8b62595
29	SIZE (rust/2023-11-16/rustc-1.74.0-powerpc-unknown-freebsd.tar.xz) = 63153412	29	SIZE (rust/2023-12-28/rustc-1.75.0-powerpc-unknown-freebsd.tar.xz) = 60967708
30	SHA256 (rust/2023-11-16/rust-std-1.74.0-powerpc-unknown-freebsd.tar.xz) = 4a4084056182a224cbaf48dc76509b33dcb4d855253b5fa1c017b51d0d81d20f	30	SHA256 (rust/2023-12-28/rust-std-1.75.0-powerpc-unknown-freebsd.tar.xz) = 602db9f267735f2d56d7bed535f5c45af33ceb87a6b4c52b97c4f72653db2a9e
31	SIZE (rust/2023-11-16/rust-std-1.74.0-powerpc-unknown-freebsd.tar.xz) = 23776296	31	SIZE (rust/2023-12-28/rust-std-1.75.0-powerpc-unknown-freebsd.tar.xz) = 23475244
32	SHA256 (rust/2023-11-16/cargo-1.74.0-powerpc-unknown-freebsd.tar.xz) = fb3da81351c04fd71559ffca1e971a216f52cb2a15354a9c454809e108dbb2bf	32	SHA256 (rust/2023-12-28/cargo-1.75.0-powerpc-unknown-freebsd.tar.xz) = 4d2e6a1f0029960aa203fae360c0ab3a486fdb2fae900c6c8509539c0a1319d2
33	SIZE (rust/2023-11-16/cargo-1.74.0-powerpc-unknown-freebsd.tar.xz) = 9989564	33	SIZE (rust/2023-12-28/cargo-1.75.0-powerpc-unknown-freebsd.tar.xz) = 9383356
34	SHA256 (rust/2023-11-16/rustc-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 2391abc91392f95bf4cee84a83d511723c0ac92971b64061450172011b7579b0	34	SHA256 (rust/2023-12-28/rustc-1.75.0-powerpc64-unknown-freebsd.tar.xz) = 150f8e1adced452caae1f9e964b674ce9857be5c0a45dfeed29cac57129d5ef8
35	SIZE (rust/2023-11-16/rustc-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 60695088	35	SIZE (rust/2023-12-28/rustc-1.75.0-powerpc64-unknown-freebsd.tar.xz) = 59768944
36	SHA256 (rust/2023-11-16/rust-std-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 3cab1582e1aee6ee0c2e4ef1095c0f4e44b7b4db24ee2a8f5fdd1a0763dc69b2	36	SHA256 (rust/2023-12-28/rust-std-1.75.0-powerpc64-unknown-freebsd.tar.xz) = f650a305a601f8ee0d4f190f793099767b102a6588e12e96c13b1d4e337d2299
37	SIZE (rust/2023-11-16/rust-std-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 23815204	37	SIZE (rust/2023-12-28/rust-std-1.75.0-powerpc64-unknown-freebsd.tar.xz) = 23461800
38	SHA256 (rust/2023-11-16/cargo-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 201b2fce30fd67080c86542895f456ca1e0191e98c1d03f6b3063887b1c70f84	38	SHA256 (rust/2023-12-28/cargo-1.75.0-powerpc64-unknown-freebsd.tar.xz) = e96e442b6febce9285d9d0b1440c32a102327e1c72a4c4443a22161fccd85486
39	SIZE (rust/2023-11-16/cargo-1.74.0-powerpc64-unknown-freebsd.tar.xz) = 9490336	39	SIZE (rust/2023-12-28/cargo-1.75.0-powerpc64-unknown-freebsd.tar.xz) = 9050496
40	SHA256 (rust/2023-11-16/rustc-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = bfd17eb45e715e7d567b624b12976bab745761499bf6f6bd0affbdef625af6b9	40	SHA256 (rust/2023-12-28/rustc-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 4ecc932c1a5e31aeda8965d6c7cc62685a570d5f79602d40db9fc8d3ccc74c5b
41	SIZE (rust/2023-11-16/rustc-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 62511012	41	SIZE (rust/2023-12-28/rustc-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 61505160
42	SHA256 (rust/2023-11-16/rust-std-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 5f777a1570fd5560b108d64abcb610ecbd7fc67452c3eb5d29300f3d84b2aba1	42	SHA256 (rust/2023-12-28/rust-std-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 90d5b3b237406be47213d23c0300ddb6c38a2fea7a13018f2c0f4abf90078851
43	SIZE (rust/2023-11-16/rust-std-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 23935072	43	SIZE (rust/2023-12-28/rust-std-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 23606636
44	SHA256 (rust/2023-11-16/cargo-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 61c69c43e37c46f1730f6c0d490f043d5170e95c3183bb9297343a849799fb30	44	SHA256 (rust/2023-12-28/cargo-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 17e65d013ccfbc126756bf3d11df0e8378f3850ff3485d37efdbea398db1910d
45	SIZE (rust/2023-11-16/cargo-1.74.0-powerpc64le-unknown-freebsd.tar.xz) = 9745192	45	SIZE (rust/2023-12-28/cargo-1.75.0-powerpc64le-unknown-freebsd.tar.xz) = 9345472
46	SHA256 (rust/2023-11-16/rustc-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = ece9e09e255e0018b807b3d8daae875ae562cdb82b97944ada8266b590e882fe	46	SHA256 (rust/2023-12-28/rustc-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = b37f32501f83c4cb5fd3b35334c3198802be3cacccfcc1812049de65a369f3b8
47	SIZE (rust/2023-11-16/rustc-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 72605232	47	SIZE (rust/2023-12-28/rustc-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = 71656164
48	SHA256 (rust/2023-11-16/rust-std-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 163dc2e3588be65bb4575c40218d98a8638d9615401392ad9f708fc98ef2d9c7	48	SHA256 (rust/2023-12-28/rust-std-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = c31ac0ea1a25517b3162191e01cd2c9033740fa9dd7d1697b75d9f1165cc2965
49	SIZE (rust/2023-11-16/rust-std-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 23923712	49	SIZE (rust/2023-12-28/rust-std-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = 23575792
50	SHA256 (rust/2023-11-16/cargo-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 50e0b763ed2a37dee3befad3b8ad2b32449b49228dd4f299b3602eb034cb9201	50	SHA256 (rust/2023-12-28/cargo-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = 6a64c7c06b18514d9abdc9aa4e86f8db8b884481ea6c7540f899336db45c0d4a
51	SIZE (rust/2023-11-16/cargo-1.74.0-riscv64gc-unknown-freebsd.tar.xz) = 12095040	51	SIZE (rust/2023-12-28/cargo-1.75.0-riscv64gc-unknown-freebsd.tar.xz) = 11699372

Removed Link Here

(-)a/lang/rust/files/no-hardlinks/patch-src_bootstrap_lib.rs (-43 lines)
1	Attempt to fix intermittent "can't find crate for `std`" build failures
2
3	The location of rustc (found via env::current_exe()) is used to
4	find the right libstd. However it might have been "copied" by
5	creating a hard link to the new location instead. Like /proc/curproc/file,
6	KERN_PROC_PATHNAME (used internally by current_exe()) can return
7	any of the file's multiple paths. Most of the time it returns the
8	right rustc path and the build will succeed but occasionally it
9	will return the "wrong" path and the build fails with:
10
11	error[E0463]: can't find crate for `std`
12
13	If this is right a viable workaround should be to never create hard
14	links during the build, so let's try that.
15
16	--- src/bootstrap/lib.rs.orig 2020-07-23 20:16:43 UTC
17	+++ src/bootstrap/lib.rs
18	@@ -1450,19 +1450,13 @@ impl Build {
19	return;
20	}
21	}
22	- if let Ok(()) = fs::hard_link(&src, dst) {
23	- // Attempt to "easy copy" by creating a hard link
24	- // (symlinks don't work on windows), but if that fails
25	- // just fall back to a slow `copy` operation.
26	- } else {
27	- if let Err(e) = fs::copy(&src, dst) {
28	- panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
29	- }
30	- t!(fs::set_permissions(dst, metadata.permissions()));
31	- let atime = FileTime::from_last_access_time(&metadata);
32	- let mtime = FileTime::from_last_modification_time(&metadata);
33	- t!(filetime::set_file_times(dst, atime, mtime));
34	+ if let Err(e) = fs::copy(&src, dst) {
35	+ panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
36	}
37	+ t!(fs::set_permissions(dst, metadata.permissions()));
38	+ let atime = FileTime::from_last_access_time(&metadata);
39	+ let mtime = FileTime::from_last_modification_time(&metadata);
40	+ t!(filetime::set_file_times(dst, atime, mtime));
41	}
42
43	/// Copies the `src` directory recursively to `dst`. Both are assumed to exist

Lines 13-21 be stabilized first. It will be available in Rust 1.56. Link Here

(-)b/lang/rust/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs (-8 / +7 lines)
13		13
14	--- src/tools/cargo/src/cargo/sources/git/source.rs.orig 2021-10-04 20:59:57 UTC	14	--- src/tools/cargo/src/cargo/sources/git/source.rs.orig 2021-10-04 20:59:57 UTC
15	+++ src/tools/cargo/src/cargo/sources/git/source.rs	15	+++ src/tools/cargo/src/cargo/sources/git/source.rs
16	@@ -92,6 +92,9 @@ impl<'cfg> Source for GitSource<'cfg> {	16	@@ -205,6 +205,9 @@ impl<'cfg> Source for GitSource<'cfg> {
17	kind: QueryKind,	17	kind: QueryKind,
18	f: &mut dyn FnMut(Summary),	18	f: &mut dyn FnMut(IndexSummary),
19	) -> Poll<CargoResult<()>> {	19	) -> Poll<CargoResult<()>> {
20	+ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {	20	+ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
21	+ return Poll::Ready(Ok(()));	21	+ return Poll::Ready(Ok(()));
Lines 23-36 be stabilized first. It will be available in Rust 1.56. Link Here
23	if let Some(src) = self.path_source.as_mut() {	23	if let Some(src) = self.path_source.as_mut() {
24	src.query(dep, kind, f)	24	src.query(dep, kind, f)
25	} else {	25	} else {
26	@@ -113,6 +116,10 @@ impl<'cfg> Source for GitSource<'cfg> {	26	@@ -228,6 +231,10 @@ impl<'cfg> Source for GitSource<'cfg> {
27
28	fn block_until_ready(&mut self) -> CargoResult<()> {
29	if self.path_source.is_some() {	27	if self.path_source.is_some() {
30	+ return Ok(());	28	self.mark_used(None)?;
		29	return Ok(());
31	+ }	30	+ }
32	+	31	+
33	+ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {	32	+ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
34	return Ok(());	33	+ return Ok(());
35	}	34	}
36		35
37	-	36	let git_fs = self.config.git_path();