Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f76ca3eea376171d71218223a1d7717dfb96855d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f76ca3eea376171d71218223a1d7717dfb96855d)
  • Date: Fri, 16 Dec 2022 22:33:22 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/rust/DETAILS
| 2
devel/rust/HISTORY
| 5
devel/rust/patches/0001-libressl-3.4.x.patch
| 4

devel/rust/patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch
| 379 ----------
4 files changed, 9 insertions(+), 381 deletions(-)

New commits:
commit f76ca3eea376171d71218223a1d7717dfb96855d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/rust: version 1.66.0

diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index bff2a72..eea25d3 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -1,5 +1,5 @@
SPELL=rust
- VERSION=1.64.0
+ VERSION=1.66.0
SECURITY_PATCH=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/rustc-$VERSION-src
TMPFS=off
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index bc46d46..9a97eb3 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,8 @@
+2022-12-16 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.66.0
+ * patches/0001-libressl-3.4.x.patch: updated for libressl 3.7
+ * patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch:
removed
+
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/0001-libressl-3.4.x.patch
b/devel/rust/patches/0001-libressl-3.4.x.patch
index 6e3b0d4..8b2b3a6 100644
--- a/devel/rust/patches/0001-libressl-3.4.x.patch
+++ b/devel/rust/patches/0001-libressl-3.4.x.patch
@@ -1,7 +1,7 @@
diff --git a/vendor/openssl-sys/build/main.rs
b/vendor/openssl-sys/build/main.rs
--- a/vendor/openssl-sys/build/main.rs
+++ b/vendor/openssl-sys/build/main.rs
-@@ -254,6 +254,10 @@ See rust-openssl README for more information:
+@@ -254,6 +254,12 @@ See rust-openssl README for more information:
(3, 3, _) => ('3', '3', 'x'),
(3, 4, 0) => ('3', '4', '0'),
(3, 4, _) => ('3', '4', 'x'),
@@ -9,6 +9,8 @@ diff --git a/vendor/openssl-sys/build/main.rs
b/vendor/openssl-sys/build/main.rs
+ (3, 5, _) => ('3', '5', 'x'),
+ (3, 6, 0) => ('3', '6', '0'),
+ (3, 6, _) => ('3', '6', 'x'),
++ (3, 7, 0) => ('3', '7', '0'),
++ (3, 7, _) => ('3', '7', 'x'),
_ => version_error(),
};

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
deleted file mode 100644
index 2fd902b..0000000
---
a/devel/rust/patches/0003-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 273a82b22a5ac25eebb076145caa9b953a3c7671 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel AT sholland.org>
-Date: Sun, 3 May 2020 17:53:33 +0200
-Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets
-
-[ismael AT sourcemage.org: Updated for rust 1.49.0]
-[ismael AT sourcemage.org: Updated for rust 1.63.0 from Void Linux patch]
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- compiler/rustc_target/src/spec/crt_objects.rs | 22 ----------
- .../rustc_target/src/spec/linux_musl_base.rs | 7 ---
- config.toml.example | 8 ----
- src/bootstrap/cc_detect.rs | 25 +----------
- src/bootstrap/compile.rs | 43 +------------------
- src/bootstrap/config.rs | 9 ----
- src/bootstrap/configure.py | 28 ------------
- src/bootstrap/lib.rs | 19 --------
- 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
-+++ b/config.toml.example
-@@ -523,14 +523,6 @@ changelog-seen = 2
- # supplementary build information, like distro-specific package versions.
- #description = <none> (string)
-
--# The root location of the musl installation directory. The library
directory
--# will also need to contain libunwind.a for an unwinding implementation.
Note
--# that this option only makes sense for musl targets that produce statically
--# linked binaries.
--#
--# Defaults to /usr on musl hosts. Has no default otherwise.
--#musl-root = <platform specific> (path)
--
- # By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix
- # platforms to ensure that the compiler is usable by default from the build
- # directory (as it links to a number of dynamic libraries). This may not be
-diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index e750c2963ddd..f6ba3032b0d5 100644
---- a/src/bootstrap/cc_detect.rs
-+++ b/src/bootstrap/cc_detect.rs
-@@ -97,7 +97,7 @@ pub fn find(build: &mut Build) {
- if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
- cfg.compiler(cc);
- } else {
-- set_compiler(&mut cfg, Language::C, target, config, build);
-+ set_compiler(&mut cfg, Language::C, target, config);
- }
-
- let compiler = cfg.get_compiler();
-@@ -125,7 +125,7 @@ pub fn find(build: &mut Build) {
- cfg.compiler(cxx);
- true
- } else if build.hosts.contains(&target) || build.build == target {
-- set_compiler(&mut cfg, Language::CPlusPlus, target, config,
build);
-+ set_compiler(&mut cfg, Language::CPlusPlus, target, config);
- true
- } else {
- // Use an auto-detected compiler (or one configured via
`CXX_target_triple` env vars).
-@@ -161,7 +161,6 @@ fn set_compiler(
- compiler: Language,
- target: TargetSelection,
- config: Option<&Target>,
-- build: &Build,
- ) {
- match &*target.triple {
- // When compiling for android we may have the NDK configured in the
-@@ -204,26 +203,6 @@ fn set_compiler(
- }
- }
-
-- "mips-unknown-linux-musl" => {
-- if cfg.get_compiler().path().to_str() == Some("gcc") {
-- cfg.compiler("mips-linux-musl-gcc");
-- }
-- }
-- "mipsel-unknown-linux-musl" => {
-- if cfg.get_compiler().path().to_str() == Some("gcc") {
-- cfg.compiler("mipsel-linux-musl-gcc");
-- }
-- }
--
-- t if t.contains("musl") => {
-- if let Some(root) = build.musl_root(target) {
-- let guess = root.join("bin/musl-gcc");
-- if guess.exists() {
-- cfg.compiler(guess);
-- }
-- }
-- }
--
- _ => {}
- }
- }
-diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index cdad1cb4d499..26552ece3e91 100644
---- a/src/bootstrap/compile.rs
-+++ b/src/bootstrap/compile.rs
-@@ -200,39 +200,7 @@ fn copy_self_contained_objects(
- let mut target_deps = vec![];
-
- // Copies the libc and CRT objects.
-- //
-- // rustc historically provides a more self-contained installation for
musl targets
-- // not requiring the presence of a native musl toolchain. For example,
it can fall back
-- // to using gcc from a glibc-targeting toolchain for linking.
-- // To do that we have to distribute musl startup objects as a part of
Rust toolchain
-- // and link with them manually in the self-contained mode.
-- if target.contains("musl") {
-- let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
-- panic!("Target {:?} does not have a \"musl-libdir\" key",
target.triple)
-- });
-- for &obj in &["libc.a", "crt1.o", "Scrt1.o", "rcrt1.o", "crti.o",
"crtn.o"] {
-- copy_and_stamp(
-- builder,
-- &libdir_self_contained,
-- &srcdir,
-- obj,
-- &mut target_deps,
-- DependencyType::TargetSelfContained,
-- );
-- }
-- let crt_path = builder.ensure(native::CrtBeginEnd { target });
-- for &obj in &["crtbegin.o", "crtbeginS.o", "crtend.o", "crtendS.o"]
{
-- let src = crt_path.join(obj);
-- let target = libdir_self_contained.join(obj);
-- builder.copy(&src, &target);
-- target_deps.push((target, DependencyType::TargetSelfContained));
-- }
--
-- if !target.starts_with("s390x") {
-- let libunwind_path = copy_llvm_libunwind(builder, target,
&libdir_self_contained);
-- target_deps.push((libunwind_path,
DependencyType::TargetSelfContained));
-- }
-- } else if target.ends_with("-wasi") {
-+ if target.ends_with("-wasi") {
- let srcdir = builder
- .wasi_root(target)
- .unwrap_or_else(|| {
-@@ -316,15 +284,6 @@ pub fn std_cargo(builder: &Builder<'_>, target:
TargetSelection, stage: u32, car
- .arg("--manifest-path")
- .arg(builder.src.join("library/test/Cargo.toml"));
-
-- // Help the libc crate compile by assisting it in finding various
-- // sysroot native libraries.
-- if target.contains("musl") {
-- if let Some(p) = builder.musl_libdir(target) {
-- let root = format!("native={}", p.to_str().unwrap());
-- cargo.rustflag("-L").rustflag(&root);
-- }
-- }
--
- if target.ends_with("-wasi") {
- if let Some(p) = builder.wasi_root(target) {
- let root = format!("native={}/lib/wasm32-wasi",
p.to_str().unwrap());
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index c0753d88504a..55ff57dca8d4 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -186,7 +186,6 @@ pub struct Config {
- pub missing_tools: bool,
-
- // Fallback musl-root for all targets
-- pub musl_root: Option<PathBuf>,
- pub prefix: Option<PathBuf>,
- pub sysconfdir: Option<PathBuf>,
- pub datadir: Option<PathBuf>,
-@@ -400,8 +399,6 @@ pub struct Target {
- pub sanitizers: Option<bool>,
- pub profiler: Option<bool>,
- pub crt_static: Option<bool>,
-- pub musl_root: Option<PathBuf>,
-- pub musl_libdir: Option<PathBuf>,
- pub wasi_root: Option<PathBuf>,
- pub qemu_rootfs: Option<PathBuf>,
- pub no_std: bool,
-@@ -689,7 +686,6 @@ define_config! {
- default_linker: Option<String> = "default-linker",
- channel: Option<String> = "channel",
- description: Option<String> = "description",
-- musl_root: Option<String> = "musl-root",
- rpath: Option<bool> = "rpath",
- verbose_tests: Option<bool> = "verbose-tests",
- optimize_tests: Option<bool> = "optimize-tests",
-@@ -734,8 +730,6 @@ define_config! {
- sanitizers: Option<bool> = "sanitizers",
- profiler: Option<bool> = "profiler",
- crt_static: Option<bool> = "crt-static",
-- musl_root: Option<String> = "musl-root",
-- musl_libdir: Option<String> = "musl-libdir",
- wasi_root: Option<String> = "wasi-root",
- qemu_rootfs: Option<String> = "qemu-rootfs",
- no_std: Option<bool> = "no-std",
-@@ -1107,7 +1101,6 @@ impl Config {
- set(&mut config.llvm_tools_enabled, rust.llvm_tools);
- config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
- config.rustc_default_linker = rust.default_linker;
-- config.musl_root = rust.musl_root.map(PathBuf::from);
- config.save_toolstates =
rust.save_toolstates.map(PathBuf::from);
- set(&mut config.deny_warnings,
flags.deny_warnings.or(rust.deny_warnings));
- set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -1164,8 +1157,6 @@ impl Config {
- target.ranlib = cfg.ranlib.map(PathBuf::from);
- target.linker = cfg.linker.map(PathBuf::from);
- target.crt_static = cfg.crt_static;
-- target.musl_root = cfg.musl_root.map(PathBuf::from);
-- target.musl_libdir = cfg.musl_libdir.map(PathBuf::from);
- target.wasi_root = cfg.wasi_root.map(PathBuf::from);
- target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
- target.sanitizers = cfg.sanitizers;
-diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 322e9d692329..47c7432f38c2 100755
---- a/src/bootstrap/configure.py
-+++ b/src/bootstrap/configure.py
-@@ -114,34 +114,6 @@ v("aarch64-linux-android-ndk",
"target.aarch64-linux-android.android-ndk",
- "aarch64-linux-android NDK standalone path")
- v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
- "x86_64-linux-android NDK standalone path")
--v("musl-root", "target.x86_64-unknown-linux-musl.musl-root",
-- "MUSL root installation directory (deprecated)")
--v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root",
-- "x86_64-unknown-linux-musl install directory")
--v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root",
-- "i586-unknown-linux-musl install directory")
--v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root",
-- "i686-unknown-linux-musl install directory")
--v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root",
-- "arm-unknown-linux-musleabi install directory")
--v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
-- "arm-unknown-linux-musleabihf install directory")
--v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
-- "armv5te-unknown-linux-musleabi install directory")
--v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root",
-- "armv7-unknown-linux-musleabi install directory")
--v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root",
-- "armv7-unknown-linux-musleabihf install directory")
--v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
-- "aarch64-unknown-linux-musl install directory")
--v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root",
-- "mips-unknown-linux-musl install directory")
--v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
-- "mipsel-unknown-linux-musl install directory")
--v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root",
-- "mips64-unknown-linux-muslabi64 install directory")
--v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root",
-- "mips64el-unknown-linux-muslabi64 install directory")
- v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
- "rootfs in qemu testing, you probably don't want to use this")
- v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
-diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 210084cf5ea6..56c188a75c52 100644
---- a/src/bootstrap/lib.rs
-+++ b/src/bootstrap/lib.rs
-@@ -1153,25 +1153,6 @@ impl Build {
- }
- }
-
-- /// Returns the "musl root" for this `target`, if defined
-- fn musl_root(&self, target: TargetSelection) -> Option<&Path> {
-- self.config
-- .target_config
-- .get(&target)
-- .and_then(|t| t.musl_root.as_ref())
-- .or_else(|| self.config.musl_root.as_ref())
-- .map(|p| &**p)
-- }
--
-- /// Returns the "musl libdir" for this `target`.
-- fn musl_libdir(&self, target: TargetSelection) -> Option<PathBuf> {
-- let t = self.config.target_config.get(&target)?;
-- if let libdir @ Some(_) = &t.musl_libdir {
-- return libdir.clone();
-- }
-- self.musl_root(target).map(|root| root.join("lib"))
-- }
--
- /// Returns the sysroot for the wasi target, if defined
- fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
- self.config.target_config.get(&target).and_then(|t|
t.wasi_root.as_ref()).map(|p| &**p)
-diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index 4cfcf6ca407b..c51168779579 100644
---- a/src/bootstrap/sanity.rs
-+++ b/src/bootstrap/sanity.rs
-@@ -11,7 +11,6 @@
- use std::collections::HashMap;
- use std::env;
- use std::ffi::{OsStr, OsString};
--use std::fs;
- use std::path::PathBuf;
- use std::process::Command;
-
-@@ -190,28 +189,6 @@ than building it.
- }
- }
-
-- // Make sure musl-root is valid
-- if target.contains("musl") {
-- // If this is a native target (host is also musl) and no
musl-root is given,
-- // fall back to the system toolchain in /usr before giving up
-- if build.musl_root(*target).is_none() && build.config.build ==
*target {
-- let target =
build.config.target_config.entry(*target).or_default();
-- target.musl_root = Some("/usr".into());
-- }
-- match build.musl_libdir(*target) {
-- Some(libdir) => {
-- if fs::metadata(libdir.join("libc.a")).is_err() {
-- panic!("couldn't find libc.a in musl libdir: {}",
libdir.display());
-- }
-- }
-- None => panic!(
-- "when targeting MUSL either the rust.musl-root \
-- option or the target.$TARGET.musl-root option
must \
-- be specified in config.toml"
-- ),
-- }
-- }
--
- if need_cmake && target.contains("msvc") {
- // There are three builds of cmake on windows: MSVC, MinGW, and
- // Cygwin. The Cygwin build does not have generators for Visual
---
-2.30.0
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f76ca3eea376171d71218223a1d7717dfb96855d), Pavel Vinogradov, 12/16/2022

Archive powered by MHonArc 2.6.24.

Top of Page