diff options
Diffstat (limited to 'repos/extra')
| -rwxr-xr-x[-rw-r--r--] | repos/extra/rust/.checksum | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | repos/extra/rust/.files | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | repos/extra/rust/abuild | 13 | ||||
| -rwxr-xr-x | repos/extra/rust/fix-curl.patch | 21 | ||||
| -rwxr-xr-x[-rw-r--r--] | repos/extra/rust/fix-linux_musl_base.patch | 0 | ||||
| -rwxr-xr-x | repos/extra/rust/libressl.patch | 10 |
6 files changed, 38 insertions, 10 deletions
diff --git a/repos/extra/rust/.checksum b/repos/extra/rust/.checksum index 515c619c..26cca43c 100644..100755 --- a/repos/extra/rust/.checksum +++ b/repos/extra/rust/.checksum @@ -1,6 +1,8 @@ e532c42d7eb325d75c298596b6865636bc88ea0df21ee7d092b0e9ada65a301f cargo-1.83.0-x86_64-unknown-linux-musl.tar.xz 879b657d8928ddb722e1e5447d3d26aa5e5df8b31e55bf037348388b3005bb5e fix-bootstrap.patch +c03ac16dbb7aecb143e7cd701feb480862af63dbb044e0f0637eaff93758937f fix-curl.patch fb0fef39b363d51813605394a68ba775dc6c9cc295bd9f9e718d0e13376bbdfc fix-linux_musl_base.patch +cfe8a050a1acc17c735c5af1b86989b38f99c14bbff509739523ede8768c2eab libressl.patch 0421a2eb37e34e28fea9318b0771e79cd2f7c8da56272e40e41b5ee1e20b7b07 rust-std-1.83.0-x86_64-unknown-linux-musl.tar.xz 34ef847a906f161bad351fa173d9c44f58cda6db3213717cd43b08c53b706eef rustc-1.83.0-x86_64-unknown-linux-musl.tar.xz ec87dbce94022019aeecf269e58bba8bc4face7d5ac8745f301a74683c065a51 rustc-1.84.1-src.tar.xz diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files index 88dea9b3..0c1f74a3 100644..100755 --- a/repos/extra/rust/.files +++ b/repos/extra/rust/.files @@ -11,7 +11,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-65b9b6b98ba223b6.so +-rw-r--r-- root/root usr/lib/librustc_driver-ce439f79e4196a4c.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/ diff --git a/repos/extra/rust/abuild b/repos/extra/rust/abuild index e3c94ade..f0e7d4fb 100755..100644 --- a/repos/extra/rust/abuild +++ b/repos/extra/rust/abuild @@ -13,8 +13,9 @@ source="https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz 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 - fix-bootstrap.patch" - #fix-curl.patch" + fix-bootstrap.patch + libressl.patch + fix-curl.patch" build_dir=${name}c-$version-src keep_static=1 no_strip=1 @@ -27,9 +28,11 @@ build() { 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/ - #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-0.4.72+curl-8.6.0/.cargo-checksum.json - + 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-0.4.52+curl-7.81.0/.cargo-checksum.json + sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.74+curl-8.9.0/.cargo-checksum.json + sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.92/.cargo-checksum.json + cat > config.toml <<EOF [llvm] link-shared = true diff --git a/repos/extra/rust/fix-curl.patch b/repos/extra/rust/fix-curl.patch index dbcb37e9..e0469d8d 100755 --- a/repos/extra/rust/fix-curl.patch +++ b/repos/extra/rust/fix-curl.patch @@ -1,7 +1,7 @@ -diff --git a/vendor/curl-sys/build.rs b/vendor/curl-sys/build.rs -index 24475cc..3249440 100644 ---- a/vendor/curl-sys-0.4.72+curl-8.6.0/build.rs -+++ b/vendor/curl-sys-0.4.72+curl-8.6.0/build.rs +diff --git a/vendor/curl-sys-0.4.52+curl-7.81.0/build.rs b/vendor/curl-sys-0.4.52+curl-7.81.0/build.rs +index e9a2a42..560bfed 100644 +--- a/vendor/curl-sys-0.4.52+curl-7.81.0/build.rs ++++ b/vendor/curl-sys-0.4.52+curl-7.81.0/build.rs @@ -111,6 +111,8 @@ fn main() { .include("curl/lib") .include("curl/include") @@ -11,3 +11,16 @@ index 24475cc..3249440 100644 .define("CURL_DISABLE_DICT", None) .define("CURL_DISABLE_GOPHER", None) .define("CURL_DISABLE_IMAP", None) +diff --git a/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs b/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs +index 7d9a661..683354e 100644 +--- a/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs ++++ b/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs +@@ -109,6 +109,8 @@ fn main() { + .include("curl/lib") + .include("curl/include") + .define("BUILDING_LIBCURL", None) ++ .define("CURL_CA_BUNDLE", "\"/etc/ssl/cert.pem\"") ++ .define("CURL_CA_PATH", "\"/etc/ssl/certs\"") + .define("CURL_DISABLE_DICT", None) + .define("CURL_DISABLE_GOPHER", None) + .define("CURL_DISABLE_IMAP", None) diff --git a/repos/extra/rust/fix-linux_musl_base.patch b/repos/extra/rust/fix-linux_musl_base.patch index a9293008..a9293008 100644..100755 --- a/repos/extra/rust/fix-linux_musl_base.patch +++ b/repos/extra/rust/fix-linux_musl_base.patch diff --git a/repos/extra/rust/libressl.patch b/repos/extra/rust/libressl.patch new file mode 100755 index 00000000..6530eab7 --- /dev/null +++ b/repos/extra/rust/libressl.patch @@ -0,0 +1,10 @@ +--- rustc-1.84.0-src-orig/vendor/openssl-sys-0.9.92/build/main.rs 2025-01-07 09:26:09.000000000 +0800 ++++ rustc-1.84.0-src/vendor/openssl-sys-0.9.92/build/main.rs 2025-01-26 00:07:32.617036110 +0800 +@@ -273,6 +273,7 @@ + (3, 7, 1) => ('3', '7', '1'), + (3, 7, _) => ('3', '7', 'x'), + (3, 8, 0) => ('3', '8', '0'), ++ (4, 0, _) => ('4', '0', 'x'), + _ => version_error(), + }; +
\ No newline at end of file |