pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust-beta: update to 1.100.0 beta.1



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Fri Oct 2 06:27:56 2026 +0200
Changeset:	8e2aec82112b539f7f271eaa8cadf66881e867a2

Modified Files:
	rust-beta/Makefile
	rust-beta/distinfo
Added Files:
	rust-beta/patches/patch-src_bootstrap_src_core_session.rs
Removed Files:
	rust-beta/patches/patch-src_bootstrap_src_lib.rs
	rust-beta/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs

Log Message:
rust-beta: update to 1.100.0 beta.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8e2aec82112b539f7f271eaa8cadf66881e867a2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust-beta/Makefile                                 |  7 ++--
 rust-beta/distinfo                                 | 21 ++++++------
 .../patch-src_bootstrap_src_core_session.rs        | 40 ++++++++++++++++++++++
 rust-beta/patches/patch-src_bootstrap_src_lib.rs   | 40 ----------------------
 ...c-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 --------
 5 files changed, 54 insertions(+), 69 deletions(-)

diffs:
diff --git a/rust-beta/Makefile b/rust-beta/Makefile
index 1c487507df..7d9f8607a1 100644
--- a/rust-beta/Makefile
+++ b/rust-beta/Makefile
@@ -6,7 +6,7 @@
 # Regenerating checksums may be needed to build the current rust-beta.
 
 DISTNAME=	rustc-beta-src
-PKGNAME=	rust-1.99.0beta.8
+PKGNAME=	rust-1.100.0beta.1
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 EXTRACT_SUFX=	.tar.xz
@@ -112,7 +112,7 @@ BUILDLINK_TRANSFORM+=	rm:-Wl,--enable-new-dtags
 # does not need any special post-processing.
 DISTFILES:=		${DEFAULT_DISTFILES}
 
-RUST_STAGE0_VER=	1.98.1
+RUST_STAGE0_VER=	1.99.0
 RUST_ARCH=		x86_64-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -133,9 +133,10 @@ CHECK_INTERPRETER_SKIP+=	${RUSTLIB_COMPILER}/rustc_codegen_gcc/y.sh
 CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/backtrace/ci/*.sh
 CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/core/src/unicode/printable.py
 CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/stdarch/ci/*.sh
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/vendor/libc-0.2.189/etc/libc-util.py
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/compiler-builtins/ci/install-test-deps.sh
 CHECK_PORTABILITY_SKIP+=	tests/run-make/dump-ice-to-disk/check.sh
 CHECK_PORTABILITY_SKIP+=	vendor/libdbus-sys-0.2.5/vendor/dbus/tools/cmake-format
-CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/vendor/libc-0.2.189/etc/libc-util.py
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
diff --git a/rust-beta/distinfo b/rust-beta/distinfo
index 328a90e49f..ec912a5eab 100644
--- a/rust-beta/distinfo
+++ b/rust-beta/distinfo
@@ -1,24 +1,23 @@
 $NetBSD$
 
-BLAKE2s (rust-1.98.1-x86_64-unknown-netbsd.tar.xz) = 6bdd08f864a0edfc881a4832bf6ea6dd34ae31179d9e6f38909e27035dcfa518
-SHA512 (rust-1.98.1-x86_64-unknown-netbsd.tar.xz) = d74256554f1f0a1c76c442842c96dc6fc2dac5ee5beaf803f42bd2c26263673de34892b4a56a01c3387febced164e3ac5493fd66379f9af506071a27a7f40c9f
-Size (rust-1.98.1-x86_64-unknown-netbsd.tar.xz) = 239120352 bytes
-BLAKE2s (rust-std-1.98.1-x86_64-unknown-netbsd.tar.xz) = acda9d5c22b1d44c174388e3981384d79e06facc4654855da3c632dc4279ce83
-SHA512 (rust-std-1.98.1-x86_64-unknown-netbsd.tar.xz) = 631590ca0a9dfaff42616f4b429d9ba25031c1c4f19771ab839f7d77db47e0e05483670c836e00564d1e21e1b41f6d5df185d7231cbbc41bd6d5e119f40eed4a
-Size (rust-std-1.98.1-x86_64-unknown-netbsd.tar.xz) = 28826684 bytes
-BLAKE2s (rustc-beta-src.tar.xz) = a35cfa5cda5b36c48e60bf930c30dcde7eb81fbad2b98f643c4feeb547ed8ec2
-SHA512 (rustc-beta-src.tar.xz) = 41e03fed0f6abd4679d1601f664648b3793c6e5fe05387af23f3bdd3a11c3023aa46b14b25f2ea45d8b0bb48b41ea1b3f32b9471fd0b90ab6ae7ddda74966831
-Size (rustc-beta-src.tar.xz) = 265188540 bytes
+BLAKE2s (rust-1.99.0-x86_64-unknown-netbsd.tar.xz) = 05019bf2f741ce83957c88f6e98db1e23269c42d6060661c959905ce1e5284cb
+SHA512 (rust-1.99.0-x86_64-unknown-netbsd.tar.xz) = 9d573d0057894eb82dc1e20b2fcc95efe990ffe80c25dce54e9e401ebf292201d0503820fc7f9f00f7784d58f9b0235873d76bcf35751b5dad18840d1bfaf28c
+Size (rust-1.99.0-x86_64-unknown-netbsd.tar.xz) = 244001004 bytes
+BLAKE2s (rust-std-1.99.0-x86_64-unknown-netbsd.tar.xz) = 83882c2459a0a4c2aff724e13ab634dbd5b286a8fca415c1cf25d87a2768c966
+SHA512 (rust-std-1.99.0-x86_64-unknown-netbsd.tar.xz) = c1363d96e51077d7e24bf8c1a17cba0751f7f9654b20396163293d4d09074c8dbfcc1aa61dbbe67d0e0f18993ed357a4e750b3a312ff25d657452ad8691cff3c
+Size (rust-std-1.99.0-x86_64-unknown-netbsd.tar.xz) = 29582788 bytes
+BLAKE2s (rustc-beta-src.tar.xz) = fa43efd9453d957948cc96341a2c568dc9d8b3d7dd5b2c5e4d90aaa011f1f852
+SHA512 (rustc-beta-src.tar.xz) = ba333cfbaef9a514dcd50962d51557a1a8f4216f4d691534591ce456d9074070d1270795b976ac99b2a2749b4cf23b396adcb0d8d1a27dffac48ec084b5ffac5
+Size (rustc-beta-src.tar.xz) = 263151044 bytes
 SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 9d5ef634c5a454e474ea5fee76da9bb768f5b3d9
 SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 8b18e1dbde59f3e8f20e93c7669618b2c7a13294
 SHA1 (patch-src_bootstrap_Cargo.toml) = 308602e469542dfd800c1ea10c1cdb393539a5a9
 SHA1 (patch-src_bootstrap_bootstrap.py) = fb89adaaf01f558d636734db5d778af4a3c67fd6
 SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = 5ecf4e371fa48bca72fa5b0adb55152c906bd813
 SHA1 (patch-src_bootstrap_src_core_builder_cargo.rs) = 47735f93b8694e772452b302b15ef8f82da4c86c
-SHA1 (patch-src_bootstrap_src_lib.rs) = 735a3f6cbb3054200dd55eebce6e9acbd285f51e
+SHA1 (patch-src_bootstrap_src_core_session.rs) = f8f471fcfebd9b47f538deefa5bc7f54cef9d0c7
 SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 3ee712da600b325de63749a1d142718d0d54ae96
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = fa7011fd1299e1b57dc68645cccac54b7ca0d8a2
 SHA1 (patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 36d927a0c3fd6ef8d211da5389a981e077aedc29
-SHA1 (patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs) = c5cd529719daee44aead47ffd97e682ca9d9a1ae
 SHA1 (patch-vendor_libc-0.2.169_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 02c4efefbf1e9e1bd98eb9524515677250ae7454
 SHA1 (patch-vendor_lzma-sys-0.1.20_config.h) = 4849052ddb2f04f539fd7060fc1b43cc3acf99c4
diff --git a/rust-beta/patches/patch-src_bootstrap_src_core_session.rs b/rust-beta/patches/patch-src_bootstrap_src_core_session.rs
new file mode 100644
index 0000000000..12b4851103
--- /dev/null
+++ b/rust-beta/patches/patch-src_bootstrap_src_core_session.rs
@@ -0,0 +1,40 @@
+$NetBSD$
+
+Don't filter out optimization flags.
+FreeBSD has a particular C++ runtime library name.
+Don't assume files in ${PREFIX}/lib are readable by the building user.
+
+--- src/bootstrap/src/core/session.rs.orig	2026-10-01 18:00:50.836508285 +0000
++++ src/bootstrap/src/core/session.rs
+@@ -1024,7 +1024,6 @@ impl Session {
+         base.args()
+             .iter()
+             .map(|s| s.to_string_lossy().into_owned())
+-            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
+             .collect::<Vec<String>>()
+     }
+ 
+@@ -1035,7 +1034,8 @@ impl Session {
+         // If we're compiling C++ on macOS then we add a flag indicating that
+         // we want libc++ (more filled out than libstdc++), ensuring that
+         // LLVM/etc are all properly compiled.
+-        if matches!(c, CLang::Cxx) && target.contains("apple-darwin") {
++        if matches!(c, CLang::Cxx) &&
++            (target.contains("apple-darwin") || target.contains("freebsd")) {
+             base.push("-stdlib=libc++".into());
+         }
+ 
+@@ -1559,7 +1559,12 @@ impl Session {
+             // 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)
++                if e.kind() == io::ErrorKind::PermissionDenied {
++                    eprintln!("Skipping copy of `{}` to `{}`: {}", src.display(), dst.display(), e);
++                    return;
++                } else {
++                    panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
++                }
+             }
+             t!(fs::set_permissions(dst, metadata.permissions()));
+ 
diff --git a/rust-beta/patches/patch-src_bootstrap_src_lib.rs b/rust-beta/patches/patch-src_bootstrap_src_lib.rs
deleted file mode 100644
index 9f8eabe566..0000000000
--- a/rust-beta/patches/patch-src_bootstrap_src_lib.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-src_bootstrap_src_lib.rs,v 1.10 2026/01/14 06:44:31 wiz Exp $
-
-Don't filter out optimization flags.
-FreeBSD has a particular C++ runtime library name.
-Don't assume files in ${PREFIX}/lib are readable by the building user.
-
---- src/bootstrap/src/lib.rs.orig	2025-09-14 15:05:11.000000000 +0000
-+++ src/bootstrap/src/lib.rs
-@@ -1256,7 +1256,6 @@ impl Build {
-         base.args()
-             .iter()
-             .map(|s| s.to_string_lossy().into_owned())
--            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
-             .collect::<Vec<String>>()
-     }
- 
-@@ -1272,7 +1271,8 @@ impl Build {
-         // If we're compiling C++ on macOS then we add a flag indicating that
-         // we want libc++ (more filled out than libstdc++), ensuring that
-         // LLVM/etc are all properly compiled.
--        if matches!(c, CLang::Cxx) && target.contains("apple-darwin") {
-+        if matches!(c, CLang::Cxx) &&
-+            (target.contains("apple-darwin") || target.contains("freebsd")) {
-             base.push("-stdlib=libc++".into());
-         }
- 
-@@ -1813,7 +1813,12 @@ impl Build {
-             // 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)
-+                if e.kind() == io::ErrorKind::PermissionDenied {
-+                    eprintln!("Skipping copy of `{}` to `{}`: {}", src.display(), dst.display(), e);
-+                    return;
-+                } else {
-+                    panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
-+                }
-             }
-             t!(fs::set_permissions(dst, metadata.permissions()));
- 
diff --git a/rust-beta/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust-beta/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
deleted file mode 100644
index b33dd8a12f..0000000000
--- a/rust-beta/patches/patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-vendor_libc-0.2.168_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.3 2026/01/13 20:48:23 wiz Exp $
-
-Apply https://github.com/rust-lang/libc/pull/4265/files
-to fix getmntinfo() from rust.
-
---- vendor/libc-0.2.168/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2025-04-05 11:35:20.818765987 +0000
-+++ vendor/libc-0.2.168/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -2850,6 +2850,7 @@ extern "C" {
-         hint: *const c_void,
-     ) -> c_int;
- 
-+    #[link_name = "__getmntinfo13"]
-     pub fn getmntinfo(mntbufp: *mut *mut crate::statvfs, flags: c_int) -> c_int;
-     pub fn getvfsstat(buf: *mut statvfs, bufsize: size_t, flags: c_int) -> c_int;
- }


Home | Main Index | Thread Index | Old Index