diff options
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/.checksum | 3 | ||||
| -rw-r--r-- | rust/.files | 64 | ||||
| -rw-r--r-- | rust/abuild | 18 |
3 files changed, 55 insertions, 30 deletions
diff --git a/rust/.checksum b/rust/.checksum index dd4aa57e..ef078204 100644 --- a/rust/.checksum +++ b/rust/.checksum @@ -1,7 +1,6 @@ b7c1c841abe75982e1980c21c58dcb6309e9b67888f61f0d7c05bc5524a7a12a cargo-1.92.0-x86_64-unknown-linux-musl.tar.xz -fd87bc0560a065ba264e0d2a99fabe6005abf60155dd2aadc475682852cb4948 fix-curl.patch 9beea74ff0e15a0c990a79e956125c376e6be3f4a93197dfbef68c93d8923603 fix-linux_musl_base.patch 29ccf4569b489ce6cbf973384418f5458766eea42907895fe0a55df66e7b9660 libressl.patch 837424fa7984e38606239fd7dc4c3a01571343f44f0105a90ff051802c9cefdb rust-std-1.92.0-x86_64-unknown-linux-musl.tar.xz ab44428537a5d82cac41c1721f9237dd6587eae592fc14809cfa52f3932b3f2e rustc-1.92.0-x86_64-unknown-linux-musl.tar.xz -c8f492b93a95d64efb51fbcc5eab1e8edc1468a3f5be923c756b69d66892161a rustc-1.93.1-src.tar.xz +7dc23035c8c455700e7dc3b65873d4ca26728c4ff1a2fa8dfb9b0872f19a3d4e rustc-1.94.0-src.tar.xz diff --git a/rust/.files b/rust/.files index dfc9e5ae..c47a856f 100644 --- a/rust/.files +++ b/rust/.files @@ -12,7 +12,7 @@ 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-20ade5b20b56f631.so +-rw-r--r-- root/root usr/lib/librustc_driver-3da740d6a4a501bb.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/ @@ -33,27 +33,47 @@ 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/bin/ -rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/rust-objcopy 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-00f3cee614132e08.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-2918403678b66c09.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-8f583c561dc1d8c0.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-0b1498b4c43a6e42.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-d1010445c70df35f.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-dcc856f7a1cdede9.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-4b7f4d9926883c9e.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-8da516e3c6e7aa87.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-85d08216fd39d9ad.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-2209ad20996add97.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-3fe2be35b4ffd660.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-d6b890f73dc3f7c0.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-cf49eb75e6deb3f7.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-363ef57f1d555d1c.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-9126af8ebece9890.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-efa58e996748225a.rlib --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-efa58e996748225a.so --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-638fb040956e1dd4.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-79069d4e892416a2.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-de3054a2c7e11405.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-d4af69c6095bb520.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-80ebce79830f6b35.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-80ebce79830f6b35.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-beab5244158d0332.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-beab5244158d0332.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-c4e843ac532088e0.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-c4e843ac532088e0.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-25fa7bb9f53bf24f.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-25fa7bb9f53bf24f.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-4443b98c5c945142.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-4443b98c5c945142.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-734a328fd0b37b85.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-734a328fd0b37b85.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-52ec3f7507f56703.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-52ec3f7507f56703.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-88752d6b314743c4.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-88752d6b314743c4.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-1ccc996f30c06e9f.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-1ccc996f30c06e9f.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-8289d0be1287c6a1.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-8289d0be1287c6a1.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-b2f0ee923b8b7c09.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-b2f0ee923b8b7c09.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-d0cf92203fb9a1df.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-d0cf92203fb9a1df.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-8256f0178df305af.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-8256f0178df305af.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-acdf4a1b8d6a1742.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-acdf4a1b8d6a1742.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-4867db646d9692cb.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-4867db646d9692cb.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-56cc99ac4a00f0cf.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-56cc99ac4a00f0cf.rmeta +-rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-56cc99ac4a00f0cf.so +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-bcedcfa55657c266.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-bcedcfa55657c266.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-7e27869dcf5440e6.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-7e27869dcf5440e6.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-55a47d4d7dff66fc.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-55a47d4d7dff66fc.rmeta +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-e924ea93f0d8ce6e.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-e924ea93f0d8ce6e.rmeta 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/rust/abuild b/rust/abuild index f4f92a4e..ba852d06 100644 --- a/rust/abuild +++ b/rust/abuild @@ -1,5 +1,5 @@ name=rust -version=1.93.1 +version=1.94.0 ##cat src/stage0.txt export _date=2025-12-11 @@ -13,8 +13,7 @@ source="https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz::noextrac 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-linux_musl_base.patch - libressl.patch - fix-curl.patch" + libressl.patch" #build_dir=${name}c-$version-src keep_static=1 no_strip=1 @@ -34,10 +33,17 @@ build() { cp $SRC/rust-std-$_rustc-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/ cp $SRC/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/ cp $SRC/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/ + + find vendor -path "*/curl-sys-*/build.rs" -exec sh -c ' +grep -q CURL_CA_BUNDLE "$1" || sed -i "/BUILDING_LIBCURL/a\\ + .define(\"CURL_CA_BUNDLE\", \"\\\\\"/etc/ssl/cert.pem\\\\\"\")\\ + .define(\"CURL_CA_PATH\", \"\\\\\"/etc/ssl/certs\\\\\"\") +" "$1" +' sh {} \; - sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.79+curl-8.12.0/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.83+curl-8.15.0/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.84+curl-8.17.0/.cargo-checksum.json + sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-*/.cargo-checksum.json + #sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.83+curl-8.15.0/.cargo-checksum.json + #sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.84+curl-8.17.0/.cargo-checksum.json sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.109/.cargo-checksum.json sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.107/.cargo-checksum.json sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.92/.cargo-checksum.json |