rust: updated to 1.79.0

2 files changed, 41 insertions, 29 deletions

diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files
index 71bdc4eb..a70b0287 100644
--- a/repos/extra/rust/.files
+++ b/repos/extra/rust/.files
@@ -11,8 +11,8 @@ drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/rustc
 -rwxr-xr-x root/root    usr/bin/rustfmt
 drwxr-xr-x root/root    usr/lib/
--rw-r--r-- root/root    usr/lib/librustc_driver-fc2bde9372d8a99b.so
--rw-r--r-- root/root    usr/lib/libstd-110e5c0f9a28dfa9.so
+-rw-r--r-- root/root    usr/lib/librustc_driver-b495f9b2be92bba2.so
+-rw-r--r-- root/root    usr/lib/libstd-9e10993679bae9bd.so
 drwxr-xr-x root/root    usr/lib/rustlib/
 -rw-r--r-- root/root    usr/lib/rustlib/components
 drwxr-xr-x root/root    usr/lib/rustlib/etc/
@@ -31,27 +31,27 @@ drwxr-xr-x root/root    usr/lib/rustlib/etc/
 -rw-r--r-- root/root    usr/lib/rustlib/rust-installer-version
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-ca6621098d4452ef.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-1db7e20537352795.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-bd78200d223e2c0f.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-11320517ce1ccb64.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-23f50b5d36e19d19.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-2c82bad776a8292f.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-09850fd2c9ca668f.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-5089b8eea2159ec1.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-2060822f0ea09c44.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-0230d116345751aa.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-6ba6a4eb3d793d8b.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-dc6cb6a10a82e984.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-e5352dbddd7609f7.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-3c083ce90e6b63da.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-110e5c0f9a28dfa9.rlib
--rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-110e5c0f9a28dfa9.so
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-88c3b5a625b1bd9b.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-6fb6691376a8a65c.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-f2499c0616a204f2.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-5b75323447342c68.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-ef8e0b13f44eec4e.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-8054880f7fe6cebf.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-c8e49d08503b3e2d.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-f8fefbdacd0ca7a4.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-b873c1e72a78471c.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-e12c52acab1f584e.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-01228bfbe2abd06c.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-1a59cd947bebaa25.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-4028a6403bbbf8a6.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-e0e9786696c768ab.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-1b59f573746fbdf0.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-2f20b30241c543cb.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-e8248edd30bafddd.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-9e914bdd43253c73.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-2545ac00c4e2892b.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-9e10993679bae9bd.rlib
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-9e10993679bae9bd.so
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-839554239783799a.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-04854cc3d329d1ad.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-4a666889e3680079.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-16731e5643a0d05c.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-0b3d01f8ab59296e.rlib
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/
 -rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/Scrt1.o
 -rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crt1.o
diff --git a/repos/extra/rust/abuild b/repos/extra/rust/abuild
index e043c8e4..b4986933 100644
--- a/repos/extra/rust/abuild
+++ b/repos/extra/rust/abuild
@@ -1,9 +1,9 @@
 name=rust
-version=1.78.0
+version=1.79.0
 
 ##cat src/stage0.txt
-export _date=2024-03-21
-export _rustc=1.77.0
+export _date=2024-05-02
+export _rustc=1.78.0
 export _cargo=$_rustc
 ##
 
@@ -11,8 +11,8 @@ release=1
 source="https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
 	https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-musl.tar.xz::noextract
 	https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz::noextract
-	https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz::noextract
-	fix-curl.patch"
+	https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz::noextract"
+#	fix-curl.patch"
 build_dir=${name}c-$version-src
 keep_static=1
 no_strip=1
@@ -26,7 +26,7 @@ build() {
 	cp $SRC/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
 	
 	sed -i 's/\(crt_static_default = \)true/\1false/' compiler/rustc_target/src/spec/base/linux_musl.rs
-	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys/.cargo-checksum.json
+	#sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys/.cargo-checksum.json
 		
 	cat > config.toml <<EOF
 [llvm]
@@ -48,6 +48,9 @@ tools          = [ "cargo", "rustfmt" ]
 sanitizers     = false
 profiler       = false
 full-bootstrap = false
+@CARGO@
+@RUST@
+@RUSTFMT@
 
 [install]
 prefix = "/usr"
@@ -74,6 +77,15 @@ jemalloc          = false
 rpath             = false
 dist-src          = false
 EOF
+
+	if [ -e /usr/bin/rustc ]; then
+		sed	-e 's|@CARGO@|cargo = "/usr/bin/cargo"|' \
+			-e 's|@RUST@|rustc = "/usr/bin/rustc"|' \
+			-e 's|@RUSTFMT@|rustfmt = "/usr/bin/rustfmt"|' \
+			-i config.toml
+	else
+		sed -e 's|@CARGO@||' -e 's|@RUST@||' -e 's|@RUSTFMT@||' -i config.toml
+	fi
 	
 	mkdir "$SRC/rust"
 	export RUST_BACKTRACE=1