aboutsummaryrefslogtreecommitdiff
path: root/rust/abuild
diff options
context:
space:
mode:
Diffstat (limited to 'rust/abuild')
-rw-r--r--rust/abuild18
1 files changed, 12 insertions, 6 deletions
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