Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (6f27ac7aa50204816107030bb8334b89adcf7c72)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (6f27ac7aa50204816107030bb8334b89adcf7c72)
  • Date: Fri, 11 Nov 2022 23:57:39 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/rust/DETAILS
| 2
devel/rust/HISTORY
| 4

devel/rust/patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch
| 54 ++++++++++
3 files changed, 55 insertions(+), 5 deletions(-)

New commits:
commit 6f27ac7aa50204816107030bb8334b89adcf7c72
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Revert "devel/rust: version 1.65.0"

The musl build is broken.

This reverts commit c1f9da197a58015c253c6e0f32acdecb58595876.

diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index 1476f12..bff2a72 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -1,5 +1,5 @@
SPELL=rust
- VERSION=1.65.0
+ VERSION=1.64.0
SECURITY_PATCH=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/rustc-$VERSION-src
TMPFS=off
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 8f0f8fb..bc46d46 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,7 +1,3 @@
-2022-11-03 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 1.65.0
- * patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch:
updated
-
2022-10-08 Pavel Vinogradov <public AT sourcemage.org>
* patches/0001-libressl-3.4.x.patch: updated for libressl 3.6

diff --git
a/devel/rust/patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch

b/devel/rust/patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index f23f3d2..2fd902b 100644
---
a/devel/rust/patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++
b/devel/rust/patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -18,6 +18,60 @@ Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
src/bootstrap/sanity.rs | 23 ----------
9 files changed, 3 insertions(+), 181 deletions(-)

+diff --git a/compiler/rustc_target/src/spec/crt_objects.rs
b/compiler/rustc_target/src/spec/crt_objects.rs
+index 76c0bf419e8c..5ea8a69265ff 100644
+--- a/compiler/rustc_target/src/spec/crt_objects.rs
++++ b/compiler/rustc_target/src/spec/crt_objects.rs
+@@ -63,28 +63,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
+ ])
+ }
+
+-pub(super) fn pre_musl_fallback() -> 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_fallback() -> 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_fallback() -> CrtObjects {
+ new(&[
+ (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
+diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs
b/compiler/rustc_target/src/spec/linux_musl_base.rs
+index 5038a967d0a0..bc432445bea7 100644
+--- a/compiler/rustc_target/src/spec/linux_musl_base.rs
++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs
+@@ -1,16 +1,9 @@
+-use crate::spec::crt_objects::{self, CrtObjectsFallback};
+ use crate::spec::TargetOptions;
+
+ pub fn opts() -> TargetOptions {
+ let mut base = super::linux_base::opts();
+
+ base.env = "musl".into();
+- base.pre_link_objects_fallback = crt_objects::pre_musl_fallback();
+- base.post_link_objects_fallback = crt_objects::post_musl_fallback();
+- base.crt_objects_fallback = Some(CrtObjectsFallback::Musl);
+-
+- // These targets statically link libc by default
+- base.crt_static_default = true;
+
+ base
+ }
diff --git a/config.toml.example b/config.toml.example
index c9e183887504..1c217d18f840 100644
--- a/config.toml.example



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (6f27ac7aa50204816107030bb8334b89adcf7c72), Ismael Luceno, 11/11/2022

Archive powered by MHonArc 2.6.24.

Top of Page