diff options
Diffstat (limited to 'repos/extra/rust')
| -rw-r--r-- | repos/extra/rust/.checksum | 6 | ||||
| -rw-r--r-- | repos/extra/rust/.files | 130 | ||||
| -rw-r--r-- | repos/extra/rust/abuild | 117 | ||||
| -rw-r--r-- | repos/extra/rust/depends | 1 | ||||
| -rw-r--r-- | repos/extra/rust/fix-curl.patch | 39 | ||||
| -rw-r--r-- | repos/extra/rust/fix-linux_musl_base.patch | 64 | ||||
| -rw-r--r-- | repos/extra/rust/libressl.patch | 92 |
7 files changed, 0 insertions, 449 deletions
diff --git a/repos/extra/rust/.checksum b/repos/extra/rust/.checksum deleted file mode 100644 index 22f948a4..00000000 --- a/repos/extra/rust/.checksum +++ /dev/null @@ -1,6 +0,0 @@ -3f90d000a1dd6ca1316c50d87f880938672a6a5e46eddce53391c4fcebc615c3 cargo-1.94.0-x86_64-unknown-linux-musl.tar.xz -9beea74ff0e15a0c990a79e956125c376e6be3f4a93197dfbef68c93d8923603 fix-linux_musl_base.patch -29ccf4569b489ce6cbf973384418f5458766eea42907895fe0a55df66e7b9660 libressl.patch -96ce082dbdac01b671ad77926b0bad148652e61ea235d81ef510307211ad3501 rust-std-1.94.0-x86_64-unknown-linux-musl.tar.xz -ca638036c881f7712dcc102a3de261353a38c47be834a72732ea1ac75951b6b8 rustc-1.94.0-x86_64-unknown-linux-musl.tar.xz -71eb97afb6596792f752b7d6bc9382727f9f50734bdd639ae35c094254e167fb rustc-1.95.0-src.tar.xz diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files deleted file mode 100644 index b2f5cda7..00000000 --- a/repos/extra/rust/.files +++ /dev/null @@ -1,130 +0,0 @@ -drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/bash_completion.d/ --rw-r--r-- root/root etc/bash_completion.d/cargo.new --rw-r--r-- root/root etc/target-spec-json-schema.json.new -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/cargo --rwxr-xr-x root/root usr/bin/cargo-fmt --rwxr-xr-x root/root usr/bin/rust-gdb --rwxr-xr-x root/root usr/bin/rust-gdbgui --rwxr-xr-x root/root usr/bin/rust-lldb --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-6c29ab68fa2459f7.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/ --rw-r--r-- root/root usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py --rw-r--r-- root/root usr/lib/rustlib/etc/gdb_lookup.py --rw-r--r-- root/root usr/lib/rustlib/etc/gdb_providers.py --rw-r--r-- root/root usr/lib/rustlib/etc/lldb_commands --rw-r--r-- root/root usr/lib/rustlib/etc/lldb_lookup.py --rw-r--r-- root/root usr/lib/rustlib/etc/lldb_providers.py --rw-r--r-- root/root usr/lib/rustlib/etc/rust_types.py --rw-r--r-- root/root usr/lib/rustlib/install.log --rw-r--r-- root/root usr/lib/rustlib/manifest-cargo --rw-r--r-- root/root usr/lib/rustlib/manifest-rust-std-x86_64-unknown-linux-musl --rw-r--r-- root/root usr/lib/rustlib/manifest-rustc --rw-r--r-- root/root usr/lib/rustlib/manifest-rustfmt-preview --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/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-50551bd923191b69.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-50551bd923191b69.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-2b2f25bc46b62971.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-2b2f25bc46b62971.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-1bdab4c3870d69b7.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-1bdab4c3870d69b7.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-336d0a19beffe517.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-336d0a19beffe517.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-101e797c9780f73e.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-101e797c9780f73e.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-dded9d7ce5c171ed.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-dded9d7ce5c171ed.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-93a8e18b4a562f16.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-93a8e18b4a562f16.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-3c78f8a46d3f0619.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-3c78f8a46d3f0619.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-b9d98b9fadd476a7.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-b9d98b9fadd476a7.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-78d1f9dd1dcfc485.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-78d1f9dd1dcfc485.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-0c7835dcee6d54d5.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-0c7835dcee6d54d5.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-b768809c41fab8db.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-b768809c41fab8db.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-8d59e6c67e774b4f.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-8d59e6c67e774b4f.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-f8e337da411e4b04.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-f8e337da411e4b04.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-038d4728c97b8e76.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-038d4728c97b8e76.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-b0e359c934922fda.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-b0e359c934922fda.rmeta --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-b0e359c934922fda.so --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-f901999b326da264.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-f901999b326da264.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-ba45c88bf5ca7e2a.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-ba45c88bf5ca7e2a.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-7bfaaed21af81589.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-7bfaaed21af81589.rmeta --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-f8cf4e9fffb667fa.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-f8cf4e9fffb667fa.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 --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtbegin.o --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtbeginS.o --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtend.o --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtendS.o --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crti.o --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtn.o --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/libc.a --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/libunwind.a --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/rcrt1.o -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/cargo-add.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-bench.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-build.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-check.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-clean.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-doc.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-fetch.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-fix.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-generate-lockfile.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-help.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-info.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-init.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-install.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-locate-project.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-login.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-logout.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-metadata.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-new.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-owner.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-package.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-pkgid.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-publish.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-remove.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-report-future-incompatibilities.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-report.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-run.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-rustc.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-rustdoc.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-search.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-test.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-tree.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-uninstall.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-update.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-vendor.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-version.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo-yank.1.gz --rw-r--r-- root/root usr/share/man/man1/cargo.1.gz --rw-r--r-- root/root usr/share/man/man1/rustc.1.gz --rw-r--r-- root/root usr/share/man/man1/rustdoc.1.gz diff --git a/repos/extra/rust/abuild b/repos/extra/rust/abuild deleted file mode 100644 index 28754a01..00000000 --- a/repos/extra/rust/abuild +++ /dev/null @@ -1,117 +0,0 @@ -name=rust -version=1.95.0 - -##cat src/stage0.txt -export _date=2026-03-05 -export _rustc=1.94.0 -export _cargo=$_rustc -## - -release=1 -source="https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz::noextract - 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-linux_musl_base.patch - libressl.patch" -keep_static=1 -no_strip=1 -skip_patch=1 - -build() { - xzcat ${name}c-$version-src.tar.xz | tar -xf - - cd ${name}c-$version-src - - for p in $SRC/*.patch; do - patch -Np1 -i $p - done - - mkdir -p build/cache/$_date - - _tuplet=x86_64-unknown-linux-musl - 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-*/.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 - - cat > config.toml <<EOF -change-id = "ignore" - -[llvm] -link-shared = true -download-ci-llvm = false -static-libstdcpp = false -use-libcxx = true - -[build] -build = "$_tuplet" -host = [ "$_tuplet" ] -target = [ "$_tuplet" ] - -docs = false -compiler-docs = false -extended = true -submodules = false -python = "python3" -locked-deps = true -vendor = true -tools = [ "cargo", "rustfmt" ] -sanitizers = false -profiler = false -full-bootstrap = false - -[install] -prefix = "/usr" - -[target.$_tuplet] -llvm-config = "/usr/bin/llvm-config" -crt-static = false -sanitizers = false - -[dist] -src-tarball = false - -[rust] -backtrace = false -channel = "stable" -codegen-tests = false -codegen-units-std = 1 -codegen-units = 0 -debug = false -debug-assertions = false -debuginfo-level = 0 -incremental = false -jemalloc = false -rpath = false -dist-src = false -llvm-libunwind = "system" -lld = false -EOF - - mkdir -p libgcc - printf 'INPUT(-lunwind)\n' > libgcc/libgcc_s.so - ln -sf $(cc -print-file-name=libunwind.so) libgcc/libgcc_s.so.1 - export LD_LIBRARY_PATH="$PWD/libgcc:$LD_LIBRARY_PATH" - export LIBRARY_PATH="$PWD/libgcc:$LIBRARY_PATH" - - mkdir "$SRC/rust" - export RUST_BACKTRACE=1 - - #python x.py build - python x.py install - - rm -rf $PKG/usr/lib/rustlib/src/ \ - $PKG/usr/share/zsh \ - $PKG/usr/lib/rustlib/uninstall.sh -} diff --git a/repos/extra/rust/depends b/repos/extra/rust/depends deleted file mode 100644 index 453889a6..00000000 --- a/repos/extra/rust/depends +++ /dev/null @@ -1 +0,0 @@ -llvm diff --git a/repos/extra/rust/fix-curl.patch b/repos/extra/rust/fix-curl.patch deleted file mode 100644 index 9d25f092..00000000 --- a/repos/extra/rust/fix-curl.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/vendor/curl-sys-0.4.79+curl-8.12.0/build.rs b/vendor/curl-sys-0.4.79+curl-8.12.0/build.rs -index 8315a20..98dedb4 100644 ---- a/vendor/curl-sys-0.4.79+curl-8.12.0/build.rs -+++ b/vendor/curl-sys-0.4.79+curl-8.12.0/build.rs -@@ -117,6 +117,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/vendor/curl-sys-0.4.83+curl-8.15.0/build.rs b/vendor/curl-sys-0.4.83+curl-8.15.0/build.rs -index 433a6c5..1bb712f 100644 ---- a/vendor/curl-sys-0.4.83+curl-8.15.0/build.rs -+++ b/vendor/curl-sys-0.4.83+curl-8.15.0/build.rs -@@ -117,6 +117,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/vendor/curl-sys-0.4.84+curl-8.17.0/build.rs b/vendor/curl-sys-0.4.84+curl-8.17.0/build.rs -index b74c085..f347449 100644 ---- a/vendor/curl-sys-0.4.84+curl-8.17.0/build.rs -+++ b/vendor/curl-sys-0.4.84+curl-8.17.0/build.rs -@@ -106,6 +106,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 deleted file mode 100644 index da4377f8..00000000 --- a/repos/extra/rust/fix-linux_musl_base.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs -index 6d3124b..a9cf0f9 100644 ---- a/compiler/rustc_target/src/spec/base/linux_musl.rs -+++ b/compiler/rustc_target/src/spec/base/linux_musl.rs -@@ -1,11 +1,8 @@ --use crate::spec::{Env, LinkSelfContainedDefault, TargetOptions, base, crt_objects}; -+use crate::spec::{base, Env, TargetOptions}; - - pub(crate) fn opts() -> TargetOptions { - TargetOptions { - env: Env::Musl, -- pre_link_objects_self_contained: crt_objects::pre_musl_self_contained(), -- post_link_objects_self_contained: crt_objects::post_musl_self_contained(), -- link_self_contained: LinkSelfContainedDefault::InferredForMusl, - ..base::linux::opts() - } - } -diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs -index 2d84e78..0e6cb0f 100644 ---- a/compiler/rustc_target/src/spec/crt_objects.rs -+++ b/compiler/rustc_target/src/spec/crt_objects.rs -@@ -62,28 +62,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects { - ]) - } - --pub(super) fn pre_musl_self_contained() -> CrtObjects { -- new(&[ -- (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]), -- (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]), -- (LinkOutputKind::StaticNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]), -- (LinkOutputKind::StaticPicExe, &["rcrt1.o", "crti.o", "crtbeginS.o"]), -- (LinkOutputKind::DynamicDylib, &["crti.o", "crtbeginS.o"]), -- (LinkOutputKind::StaticDylib, &["crti.o", "crtbeginS.o"]), -- ]) --} -- --pub(super) fn post_musl_self_contained() -> CrtObjects { -- new(&[ -- (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]), -- (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]), -- (LinkOutputKind::StaticNoPicExe, &["crtend.o", "crtn.o"]), -- (LinkOutputKind::StaticPicExe, &["crtendS.o", "crtn.o"]), -- (LinkOutputKind::DynamicDylib, &["crtendS.o", "crtn.o"]), -- (LinkOutputKind::StaticDylib, &["crtendS.o", "crtn.o"]), -- ]) --} -- - pub(super) fn pre_mingw_self_contained() -> CrtObjects { - new(&[ - (LinkOutputKind::DynamicNoPicExe, &["crt2.o"]), -diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs -index 8dcdc5b..25f53d6 100644 ---- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs -+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs -@@ -14,8 +14,7 @@ pub(crate) fn target() -> Target { - | SanitizerSet::MEMORY - | SanitizerSet::THREAD; - base.supports_xray = true; -- // FIXME(compiler-team#422): musl targets should be dynamically linked by default. -- base.crt_static_default = true; -+ base.crt_static_default = false; - - Target { - llvm_target: "x86_64-unknown-linux-musl".into(), diff --git a/repos/extra/rust/libressl.patch b/repos/extra/rust/libressl.patch deleted file mode 100644 index cc8ef966..00000000 --- a/repos/extra/rust/libressl.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/vendor/openssl-sys-0.9.107/build/main.rs b/vendor/openssl-sys-0.9.107/build/main.rs -index c4ac240e..906958e3 100644 ---- a/vendor/openssl-sys-0.9.107/build/main.rs -+++ b/vendor/openssl-sys-0.9.107/build/main.rs -@@ -151,6 +151,7 @@ fn main() { - println!("cargo:rustc-check-cfg=cfg(libressl390)"); - println!("cargo:rustc-check-cfg=cfg(libressl400)"); - println!("cargo:rustc-check-cfg=cfg(libressl410)"); -+ println!("cargo:rustc-check-cfg=cfg(libressl420)"); - - println!("cargo:rustc-check-cfg=cfg(ossl101)"); - println!("cargo:rustc-check-cfg=cfg(ossl102)"); -@@ -449,6 +450,10 @@ See rust-openssl documentation for more information: - (3, 9, _) => ('3', '9', 'x'), - (4, 0, 0) => ('4', '0', '0'), - (4, 0, _) => ('4', '0', 'x'), -+ (4, 1, 0) => ('4', '1', '0'), -+ (4, 1, _) => ('4', '1', 'x'), -+ (4, 2, 0) => ('4', '2', '0'), -+ (4, 2, _) => ('4', '2', 'x'), - _ => version_error(), - }; - -@@ -491,7 +496,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3), or LibreSSL 2.5 --through 4.0.x, but a different version of OpenSSL was found. The build is now aborting -+through 4.2.x, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " -diff --git a/vendor/openssl-sys-0.9.109/build/main.rs b/vendor/openssl-sys-0.9.109/build/main.rs -index 4007a265..906958e3 100644 ---- a/vendor/openssl-sys-0.9.109/build/main.rs -+++ b/vendor/openssl-sys-0.9.109/build/main.rs -@@ -151,6 +151,7 @@ fn main() { - println!("cargo:rustc-check-cfg=cfg(libressl390)"); - println!("cargo:rustc-check-cfg=cfg(libressl400)"); - println!("cargo:rustc-check-cfg=cfg(libressl410)"); -+ println!("cargo:rustc-check-cfg=cfg(libressl420)"); - - println!("cargo:rustc-check-cfg=cfg(ossl101)"); - println!("cargo:rustc-check-cfg=cfg(ossl102)"); -@@ -451,6 +452,8 @@ See rust-openssl documentation for more information: - (4, 0, _) => ('4', '0', 'x'), - (4, 1, 0) => ('4', '1', '0'), - (4, 1, _) => ('4', '1', 'x'), -+ (4, 2, 0) => ('4', '2', '0'), -+ (4, 2, _) => ('4', '2', 'x'), - _ => version_error(), - }; - -@@ -493,7 +496,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3), or LibreSSL 2.5 --through 4.1.x, but a different version of OpenSSL was found. The build is now aborting -+through 4.2.x, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " -diff --git a/vendor/openssl-sys-0.9.92/build/main.rs b/vendor/openssl-sys-0.9.92/build/main.rs -index 21ccf3d0..3bd07b5f 100644 ---- a/vendor/openssl-sys-0.9.92/build/main.rs -+++ b/vendor/openssl-sys-0.9.92/build/main.rs -@@ -273,6 +273,16 @@ See rust-openssl documentation for more information: - (3, 7, 1) => ('3', '7', '1'), - (3, 7, _) => ('3', '7', 'x'), - (3, 8, 0) => ('3', '8', '0'), -+ (3, 8, 1) => ('3', '8', '1'), -+ (3, 8, _) => ('3', '8', 'x'), -+ (3, 9, 0) => ('3', '9', '0'), -+ (3, 9, _) => ('3', '9', 'x'), -+ (4, 0, 0) => ('4', '0', '0'), -+ (4, 0, _) => ('4', '0', 'x'), -+ (4, 1, 0) => ('4', '1', '0'), -+ (4, 1, _) => ('4', '1', 'x'), -+ (4, 2, 0) => ('4', '2', '0'), -+ (4, 2, _) => ('4', '2', 'x'), - _ => version_error(), - }; - -@@ -315,7 +325,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3.0.0), or LibreSSL 2.5 --through 3.8.0, but a different version of OpenSSL was found. The build is now aborting -+through 4.2.x, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " |