diff options
| -rw-r--r-- | repos/extra/rust/.checksum | 3 | ||||
| -rw-r--r-- | repos/extra/rust/.files | 44 | ||||
| -rwxr-xr-x | repos/extra/rust/abuild | 5 | ||||
| -rw-r--r-- | repos/extra/rust/fix-linux_musl_base.patch | 57 |
4 files changed, 84 insertions, 25 deletions
diff --git a/repos/extra/rust/.checksum b/repos/extra/rust/.checksum index ab1f8b4d..515c619c 100644 --- a/repos/extra/rust/.checksum +++ b/repos/extra/rust/.checksum @@ -1,5 +1,6 @@ e532c42d7eb325d75c298596b6865636bc88ea0df21ee7d092b0e9ada65a301f cargo-1.83.0-x86_64-unknown-linux-musl.tar.xz 879b657d8928ddb722e1e5447d3d26aa5e5df8b31e55bf037348388b3005bb5e fix-bootstrap.patch +fb0fef39b363d51813605394a68ba775dc6c9cc295bd9f9e718d0e13376bbdfc fix-linux_musl_base.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 -405fb455de32ca2303c743d94f9939700074e757bc08e25846b3055cf23e498e rustc-1.84.0-src.tar.xz +ec87dbce94022019aeecf269e58bba8bc4face7d5ac8745f301a74683c065a51 rustc-1.84.1-src.tar.xz diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files index ae21095a..88dea9b3 100644 --- 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-d8e664d347e37fb1.so +-rw-r--r-- root/root usr/lib/librustc_driver-65b9b6b98ba223b6.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/ @@ -32,27 +32,27 @@ 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-070ebbf3d3cc8b6c.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-43fea2fde5135f63.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-eadd944f4cf3a504.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-9bbfd88a1fe388f7.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-708ef84a02a23b8d.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-ed19b37131872ba6.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-56014f5b9576bd6d.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-899acdd70339a3b3.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-061b0cbf88dc757a.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-4087cb49e0d3fdc4.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-10ea966f78eeef18.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-f5f89fa36d0381d3.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-1435cdf3ac794deb.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-6ace3ecdd25873d8.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-2d02e09d83640c29.rlib --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-2d02e09d83640c29.so --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-79cfd35068e61699.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-efe6a78a5a69d37c.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-2ff5651fa118157f.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-37d98732b1a88a32.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-a2a53a9a91a94c71.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-4defd4c410ff6459.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-5626cc85f927ec30.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-2ecd7722e2951db5.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-057efe2ac648c340.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-8ceeed3ede950727.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-8d3f7f658b3745fa.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-b828efa1ccb298b1.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-2b9c302811aa6f53.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-bb3e967bc2993f3c.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-38764946bf13de0e.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-da76feed4dc818ea.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-a09abacdfc4b0d9f.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-73ac8d6dd28b581d.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-857513af4282987d.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-ef80bf39f999aba7.rlib +-rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-ef80bf39f999aba7.so +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-47acc5df8282740d.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-69588b7802c44688.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-597bc04ab203e1f1.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-a808b4ed1df3c455.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-3bff95575100afb3.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 35acd41b..e3c94ade 100755 --- a/repos/extra/rust/abuild +++ b/repos/extra/rust/abuild @@ -1,5 +1,5 @@ name=rust -version=1.84.0 +version=1.84.1 ##cat src/stage0.txt export _date=2024-11-28 @@ -12,6 +12,7 @@ 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-linux_musl_base.patch fix-bootstrap.patch" #fix-curl.patch" build_dir=${name}c-$version-src @@ -26,7 +27,7 @@ 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/\(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 cat > config.toml <<EOF diff --git a/repos/extra/rust/fix-linux_musl_base.patch b/repos/extra/rust/fix-linux_musl_base.patch new file mode 100644 index 00000000..a9293008 --- /dev/null +++ b/repos/extra/rust/fix-linux_musl_base.patch @@ -0,0 +1,57 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Sat, 08 Aug 2016 15:06:00 +0200 +Subject: [PATCH] Fix linux_musl_base for native musl host + +See https://github.com/rust-lang/rust/pull/40113 + +--- a/compiler/rustc_target/src/spec/base/linux_musl.rs ++++ b/compiler/rustc_target/src/spec/base/linux_musl.rs +@@ -1,15 +1,12 @@ +-use crate::spec::{LinkSelfContainedDefault, TargetOptions, base, crt_objects}; ++use crate::spec::{base, TargetOptions}; + + pub(crate) fn opts() -> TargetOptions { + let mut base = base::linux::opts(); + + base.env = "musl".into(); +- base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained(); +- base.post_link_objects_self_contained = crt_objects::post_musl_self_contained(); +- base.link_self_contained = LinkSelfContainedDefault::InferredForMusl; + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +--- a/compiler/rustc_target/src/spec/crt_objects.rs ++++ b/compiler/rustc_target/src/spec/crt_objects.rs +@@ -58,28 +61,6 @@ + (LinkOutputKind::StaticPicExe, &[obj]), + (LinkOutputKind::DynamicDylib, &[obj]), + (LinkOutputKind::StaticDylib, &[obj]), +- ]) +-} +- +-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"]), + ]) + } + |