Compare commits
No commits in common. "c8-stream-rhel8" and "c8s-stream-rhel8-bootstrap" have entirely different histories.
c8-stream-
...
c8s-stream
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/rustc-1.84.1-src.tar.xz
|
SOURCES/rustc-1.65.0-src.tar.xz
|
||||||
SOURCES/wasi-libc-wasi-sdk-25.tar.gz
|
SOURCES/wasi-libc-wasi-sdk-16.tar.gz
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
787899153e848b012d8bbd6ec0baf0ed5e189831 SOURCES/rustc-1.84.1-src.tar.xz
|
920c591d3eff79705ada847aac7f77fa616dc40f SOURCES/rustc-1.65.0-src.tar.xz
|
||||||
c42dc30854ecbce5380304c38bd48b5911d1ce62 SOURCES/wasi-libc-wasi-sdk-25.tar.gz
|
ed5b6eda840f9c96fcd9307c7f5ce81fbf372def SOURCES/wasi-libc-wasi-sdk-16.tar.gz
|
||||||
|
@ -1,53 +0,0 @@
|
|||||||
From 5273432acfae75d6e509bbebcf8d28b0f3d820d0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Fri, 9 Jun 2023 15:23:08 -0700
|
|
||||||
Subject: [PATCH] Let environment variables override some default CPUs
|
|
||||||
|
|
||||||
---
|
|
||||||
.../src/spec/targets/powerpc64le_unknown_linux_gnu.rs | 2 +-
|
|
||||||
.../rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs | 2 +-
|
|
||||||
.../rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs | 2 +-
|
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
|
||||||
index 23913687a1fd..3253fbc84c74 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
pub(crate) fn target() -> Target {
|
|
||||||
let mut base = base::linux_gnu::opts();
|
|
||||||
- base.cpu = "ppc64le".into();
|
|
||||||
+ base.cpu = option_env!("RUSTC_TARGET_CPU_PPC64LE").unwrap_or("ppc64le").into();
|
|
||||||
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
|
|
||||||
base.max_atomic_width = Some(64);
|
|
||||||
base.stack_probes = StackProbeType::Inline;
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
|
||||||
index a84a18a433ff..441af1018ff3 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
|
||||||
@@ -5,7 +5,7 @@ pub(crate) fn target() -> Target {
|
|
||||||
let mut base = base::linux_gnu::opts();
|
|
||||||
base.endian = Endian::Big;
|
|
||||||
// z10 is the oldest CPU supported by LLVM
|
|
||||||
- base.cpu = "z10".into();
|
|
||||||
+ base.cpu = option_env!("RUSTC_TARGET_CPU_S390X").unwrap_or("z10").into();
|
|
||||||
base.max_atomic_width = Some(128);
|
|
||||||
base.min_global_align = Some(16);
|
|
||||||
base.stack_probes = StackProbeType::Inline;
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
|
|
||||||
index 59ec6c7f9d5f..b6f1be890b20 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
pub(crate) fn target() -> Target {
|
|
||||||
let mut base = base::linux_gnu::opts();
|
|
||||||
- base.cpu = "x86-64".into();
|
|
||||||
+ base.cpu = option_env!("RUSTC_TARGET_CPU_X86_64").unwrap_or("x86-64").into();
|
|
||||||
base.plt_by_default = false;
|
|
||||||
base.max_atomic_width = Some(64);
|
|
||||||
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
|
|
||||||
--
|
|
||||||
2.47.1
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
|||||||
From e4e678eb9cbd90acf2ba51e9ec0209b05c4403b5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <cuviper@gmail.com>
|
|
||||||
Date: Thu, 9 Jan 2025 16:47:10 -0800
|
|
||||||
Subject: [PATCH] Only translate profile flags for Clang
|
|
||||||
|
|
||||||
---
|
|
||||||
src/flags.rs | 16 +++++++++-------
|
|
||||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/flags.rs b/src/flags.rs
|
|
||||||
index 81834cf625f7..1a53c1b2345c 100644
|
|
||||||
--- a/src/flags.rs
|
|
||||||
+++ b/src/flags.rs
|
|
||||||
@@ -201,13 +201,15 @@ impl<'this> RustcCodegenFlags<'this> {
|
|
||||||
if self.no_vectorize_slp {
|
|
||||||
push_if_supported("-fno-slp-vectorize".into());
|
|
||||||
}
|
|
||||||
- // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-generate
|
|
||||||
- if let Some(value) = self.profile_generate {
|
|
||||||
- push_if_supported(format!("-fprofile-generate={value}").into());
|
|
||||||
- }
|
|
||||||
- // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-use
|
|
||||||
- if let Some(value) = self.profile_use {
|
|
||||||
- push_if_supported(format!("-fprofile-use={value}").into());
|
|
||||||
+ if let ToolFamily::Clang { .. } = family {
|
|
||||||
+ // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-generate
|
|
||||||
+ if let Some(value) = self.profile_generate {
|
|
||||||
+ push_if_supported(format!("-fprofile-generate={value}").into());
|
|
||||||
+ }
|
|
||||||
+ // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-use
|
|
||||||
+ if let Some(value) = self.profile_use {
|
|
||||||
+ push_if_supported(format!("-fprofile-use={value}").into());
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
// https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-mguard
|
|
||||||
if let Some(value) = self.control_flow_guard {
|
|
||||||
--
|
|
||||||
2.47.1
|
|
||||||
|
|
26
SOURCES/0001-Use-lld-provided-by-system-for-wasm.patch
Normal file
26
SOURCES/0001-Use-lld-provided-by-system-for-wasm.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From b521511174b1a08dddfac243604d649b71cc7386 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ivan Mironov <mironov.ivan@gmail.com>
|
||||||
|
Date: Sun, 8 Dec 2019 17:23:08 +0500
|
||||||
|
Subject: [PATCH] Use lld provided by system for wasm
|
||||||
|
|
||||||
|
---
|
||||||
|
compiler/rustc_target/src/spec/wasm_base.rs | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
|
||||||
|
index de7b7374af31..eebbe616e9b6 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/wasm_base.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/wasm_base.rs
|
||||||
|
@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions {
|
||||||
|
// arguments just yet
|
||||||
|
limit_rdylib_exports: false,
|
||||||
|
|
||||||
|
- // we use the LLD shipped with the Rust toolchain by default
|
||||||
|
- linker: Some("rust-lld".into()),
|
||||||
|
+ linker: Some("lld".into()),
|
||||||
|
lld_flavor: LldFlavor::Wasm,
|
||||||
|
linker_is_gnu: false,
|
||||||
|
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
@ -1,80 +0,0 @@
|
|||||||
From 3d8c6d095581e8d7585f3772cfd16f6367f3c008 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Fri, 16 Aug 2024 10:12:58 -0700
|
|
||||||
Subject: [PATCH] Use lld provided by system
|
|
||||||
|
|
||||||
---
|
|
||||||
compiler/rustc_target/src/spec/base/wasm.rs | 3 +--
|
|
||||||
.../src/spec/targets/aarch64_unknown_none_softfloat.rs | 2 +-
|
|
||||||
compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs | 1 +
|
|
||||||
compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
|
|
||||||
compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
|
|
||||||
5 files changed, 5 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
|
|
||||||
index f237391016e7..08bcd9699b4a 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/base/wasm.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/base/wasm.rs
|
|
||||||
@@ -85,8 +85,7 @@ macro_rules! args {
|
|
||||||
// arguments just yet
|
|
||||||
limit_rdylib_exports: false,
|
|
||||||
|
|
||||||
- // we use the LLD shipped with the Rust toolchain by default
|
|
||||||
- linker: Some("rust-lld".into()),
|
|
||||||
+ linker: Some("lld".into()),
|
|
||||||
linker_flavor: LinkerFlavor::WasmLld(Cc::No),
|
|
||||||
|
|
||||||
pre_link_args,
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
|
|
||||||
index 222d5651b521..4b780bc8a8e7 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
|
|
||||||
@@ -14,7 +14,7 @@ pub fn target() -> Target {
|
|
||||||
let opts = TargetOptions {
|
|
||||||
abi: "softfloat".into(),
|
|
||||||
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
|
|
||||||
- linker: Some("rust-lld".into()),
|
|
||||||
+ linker: Some("lld".into()),
|
|
||||||
features: "+v8a,+strict-align,-neon,-fp-armv8".into(),
|
|
||||||
relocation_model: RelocModel::Static,
|
|
||||||
disable_redzone: true,
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
|
|
||||||
index 429303170b6b..19d4ec53f6d8 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
|
|
||||||
@@ -9,6 +9,7 @@ pub fn target() -> Target {
|
|
||||||
base.max_atomic_width = Some(128);
|
|
||||||
base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]);
|
|
||||||
base.features = "+v8a".into();
|
|
||||||
+ base.linker = Some("lld".into());
|
|
||||||
|
|
||||||
Target {
|
|
||||||
llvm_target: "aarch64-unknown-windows".into(),
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
||||||
index 549706998d46..b7e9158ddef5 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
||||||
@@ -17,7 +17,7 @@ pub fn target() -> Target {
|
|
||||||
static_position_independent_executables: true,
|
|
||||||
relro_level: RelroLevel::Full,
|
|
||||||
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
|
|
||||||
- linker: Some("rust-lld".into()),
|
|
||||||
+ linker: Some("lld".into()),
|
|
||||||
features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
|
|
||||||
supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
|
|
||||||
disable_redzone: true,
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
||||||
index 6da1fcca58c8..c84ae44576d4 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
||||||
@@ -16,6 +16,7 @@ pub fn target() -> Target {
|
|
||||||
base.plt_by_default = false;
|
|
||||||
base.max_atomic_width = Some(64);
|
|
||||||
base.entry_abi = Conv::X86_64Win64;
|
|
||||||
+ base.linker = Some("lld".into());
|
|
||||||
|
|
||||||
// We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
|
|
||||||
// enable these CPU features explicitly before their first use, otherwise their instructions
|
|
||||||
--
|
|
||||||
2.46.0
|
|
||||||
|
|
@ -1,102 +0,0 @@
|
|||||||
From 8d4d52446347872816ab51958e9f3162cf722ee6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Thu, 28 Sep 2023 18:14:28 -0700
|
|
||||||
Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
|
|
||||||
|
|
||||||
---
|
|
||||||
config.example.toml | 5 +++++
|
|
||||||
src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
|
|
||||||
src/bootstrap/src/core/config/config.rs | 8 ++++++++
|
|
||||||
src/bootstrap/src/lib.rs | 5 +++++
|
|
||||||
4 files changed, 22 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/config.example.toml b/config.example.toml
|
|
||||||
index d3233ad17b51..6a1f097c20cb 100644
|
|
||||||
--- a/config.example.toml
|
|
||||||
+++ b/config.example.toml
|
|
||||||
@@ -916,6 +916,11 @@
|
|
||||||
# argument as the test binary.
|
|
||||||
#runner = <none> (string)
|
|
||||||
|
|
||||||
+# Copy libc and CRT objects into the target lib/self-contained/ directory.
|
|
||||||
+# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
|
|
||||||
+# targets may ignore this setting if they have nothing to be contained.
|
|
||||||
+#self-contained = <platform-specific> (bool)
|
|
||||||
+
|
|
||||||
# =============================================================================
|
|
||||||
# Distribution options
|
|
||||||
#
|
|
||||||
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
index 8e088682f92d..843b7123b120 100644
|
|
||||||
--- a/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
+++ b/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
@@ -346,6 +346,10 @@ fn copy_self_contained_objects(
|
|
||||||
compiler: &Compiler,
|
|
||||||
target: TargetSelection,
|
|
||||||
) -> Vec<(PathBuf, DependencyType)> {
|
|
||||||
+ if builder.self_contained(target) != Some(true) {
|
|
||||||
+ return vec![];
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
let libdir_self_contained =
|
|
||||||
builder.sysroot_target_libdir(*compiler, target).join("self-contained");
|
|
||||||
t!(fs::create_dir_all(&libdir_self_contained));
|
|
||||||
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
|
|
||||||
index e706aba977b6..a55d98e94dd8 100644
|
|
||||||
--- a/src/bootstrap/src/core/config/config.rs
|
|
||||||
+++ b/src/bootstrap/src/core/config/config.rs
|
|
||||||
@@ -627,6 +627,7 @@ pub struct Target {
|
|
||||||
pub runner: Option<String>,
|
|
||||||
pub no_std: bool,
|
|
||||||
pub codegen_backends: Option<Vec<String>>,
|
|
||||||
+ pub self_contained: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Target {
|
|
||||||
@@ -638,6 +639,9 @@ pub fn from_triple(triple: &str) -> Self {
|
|
||||||
if triple.contains("emscripten") {
|
|
||||||
target.runner = Some("node".into());
|
|
||||||
}
|
|
||||||
+ if triple.contains("-musl") || triple.contains("-wasi") || triple.contains("-windows-gnu") {
|
|
||||||
+ target.self_contained = true;
|
|
||||||
+ }
|
|
||||||
target
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1213,6 +1217,7 @@ struct TomlTarget {
|
|
||||||
no_std: Option<bool> = "no-std",
|
|
||||||
codegen_backends: Option<Vec<String>> = "codegen-backends",
|
|
||||||
runner: Option<String> = "runner",
|
|
||||||
+ self_contained: Option<bool> = "self-contained",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2038,6 +2043,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
|
|
||||||
if let Some(s) = cfg.no_std {
|
|
||||||
target.no_std = s;
|
|
||||||
}
|
|
||||||
+ if let Some(s) = cfg.self_contained {
|
|
||||||
+ target.self_contained = s;
|
|
||||||
+ }
|
|
||||||
target.cc = cfg.cc.map(PathBuf::from);
|
|
||||||
target.cxx = cfg.cxx.map(PathBuf::from);
|
|
||||||
target.ar = cfg.ar.map(PathBuf::from);
|
|
||||||
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
|
|
||||||
index c384fd6bf435..a101c010b740 100644
|
|
||||||
--- a/src/bootstrap/src/lib.rs
|
|
||||||
+++ b/src/bootstrap/src/lib.rs
|
|
||||||
@@ -1351,6 +1351,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
|
|
||||||
self.config.target_config.get(&target).map(|t| t.no_std)
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /// Returns `true` if this is a self-contained `target`, if defined
|
|
||||||
+ fn self_contained(&self, target: TargetSelection) -> Option<bool> {
|
|
||||||
+ self.config.target_config.get(&target).map(|t| t.self_contained)
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/// Returns `true` if the target will be tested using the `remote-test-client`
|
|
||||||
/// and `remote-test-server` binaries.
|
|
||||||
fn remote_tested(&self, target: TargetSelection) -> bool {
|
|
||||||
--
|
|
||||||
2.47.1
|
|
||||||
|
|
@ -0,0 +1,182 @@
|
|||||||
|
From 92b0b20e4119241aaeabb4b91189a9fca8ff8b5d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Fri, 14 Oct 2022 16:11:28 -0700
|
||||||
|
Subject: [PATCH] compiletest: set the dylib path when gathering target cfg
|
||||||
|
|
||||||
|
If the compiler is built with `rpath = false`, then it won't find its
|
||||||
|
own libraries unless the library search path is set. We already do that
|
||||||
|
while running the actual compiletests, but #100260 added another rustc
|
||||||
|
command for getting the target cfg.
|
||||||
|
|
||||||
|
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
|
||||||
|
thread 'main' panicked at 'error: failed to get cfg info from "[...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc"
|
||||||
|
--- stdout
|
||||||
|
|
||||||
|
--- stderr
|
||||||
|
[...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-a2a76dc626cd02d2.so: cannot open shared object file: No such file or directory
|
||||||
|
', src/tools/compiletest/src/common.rs:476:13
|
||||||
|
|
||||||
|
Now the library path is set here as well, so it works without rpath.
|
||||||
|
|
||||||
|
(cherry picked from commit 97c3608326d123f5462e3504409a3a069611c0fb)
|
||||||
|
---
|
||||||
|
src/tools/compiletest/src/common.rs | 17 ++++++++++-------
|
||||||
|
src/tools/compiletest/src/runtest.rs | 27 +++------------------------
|
||||||
|
src/tools/compiletest/src/util.rs | 23 +++++++++++++++++++++++
|
||||||
|
3 files changed, 36 insertions(+), 31 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
|
||||||
|
index 64df76e27720..53b64e7d1fc3 100644
|
||||||
|
--- a/src/tools/compiletest/src/common.rs
|
||||||
|
+++ b/src/tools/compiletest/src/common.rs
|
||||||
|
@@ -2,11 +2,12 @@
|
||||||
|
|
||||||
|
use std::ffi::OsString;
|
||||||
|
use std::fmt;
|
||||||
|
+use std::iter;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::Command;
|
||||||
|
use std::str::FromStr;
|
||||||
|
|
||||||
|
-use crate::util::PathBufExt;
|
||||||
|
+use crate::util::{add_dylib_path, PathBufExt};
|
||||||
|
use lazycell::LazyCell;
|
||||||
|
use test::ColorConfig;
|
||||||
|
|
||||||
|
@@ -389,7 +390,7 @@ pub fn run_enabled(&self) -> bool {
|
||||||
|
}
|
||||||
|
|
||||||
|
fn target_cfg(&self) -> &TargetCfg {
|
||||||
|
- self.target_cfg.borrow_with(|| TargetCfg::new(&self.rustc_path, &self.target))
|
||||||
|
+ self.target_cfg.borrow_with(|| TargetCfg::new(self))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn matches_arch(&self, arch: &str) -> bool {
|
||||||
|
@@ -455,20 +456,22 @@ pub enum Endian {
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TargetCfg {
|
||||||
|
- fn new(rustc_path: &Path, target: &str) -> TargetCfg {
|
||||||
|
- let output = match Command::new(rustc_path)
|
||||||
|
+ fn new(config: &Config) -> TargetCfg {
|
||||||
|
+ let mut command = Command::new(&config.rustc_path);
|
||||||
|
+ add_dylib_path(&mut command, iter::once(&config.compile_lib_path));
|
||||||
|
+ let output = match command
|
||||||
|
.arg("--print=cfg")
|
||||||
|
.arg("--target")
|
||||||
|
- .arg(target)
|
||||||
|
+ .arg(&config.target)
|
||||||
|
.output()
|
||||||
|
{
|
||||||
|
Ok(output) => output,
|
||||||
|
- Err(e) => panic!("error: failed to get cfg info from {:?}: {e}", rustc_path),
|
||||||
|
+ Err(e) => panic!("error: failed to get cfg info from {:?}: {e}", config.rustc_path),
|
||||||
|
};
|
||||||
|
if !output.status.success() {
|
||||||
|
panic!(
|
||||||
|
"error: failed to get cfg info from {:?}\n--- stdout\n{}\n--- stderr\n{}",
|
||||||
|
- rustc_path,
|
||||||
|
+ config.rustc_path,
|
||||||
|
String::from_utf8(output.stdout).unwrap(),
|
||||||
|
String::from_utf8(output.stderr).unwrap(),
|
||||||
|
);
|
||||||
|
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
|
||||||
|
index 8f289876f730..eb467170249d 100644
|
||||||
|
--- a/src/tools/compiletest/src/runtest.rs
|
||||||
|
+++ b/src/tools/compiletest/src/runtest.rs
|
||||||
|
@@ -13,7 +13,7 @@
|
||||||
|
use crate::header::TestProps;
|
||||||
|
use crate::json;
|
||||||
|
use crate::read2::read2_abbreviated;
|
||||||
|
-use crate::util::{logv, PathBufExt};
|
||||||
|
+use crate::util::{add_dylib_path, dylib_env_var, logv, PathBufExt};
|
||||||
|
use crate::ColorConfig;
|
||||||
|
use regex::{Captures, Regex};
|
||||||
|
use rustfix::{apply_suggestions, get_suggestions_from_json, Filter};
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
use std::hash::{Hash, Hasher};
|
||||||
|
use std::io::prelude::*;
|
||||||
|
use std::io::{self, BufReader};
|
||||||
|
+use std::iter;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::{Child, Command, ExitStatus, Output, Stdio};
|
||||||
|
use std::str;
|
||||||
|
@@ -72,19 +73,6 @@ fn disable_error_reporting<F: FnOnce() -> R, R>(f: F) -> R {
|
||||||
|
f()
|
||||||
|
}
|
||||||
|
|
||||||
|
-/// The name of the environment variable that holds dynamic library locations.
|
||||||
|
-pub fn dylib_env_var() -> &'static str {
|
||||||
|
- if cfg!(windows) {
|
||||||
|
- "PATH"
|
||||||
|
- } else if cfg!(target_os = "macos") {
|
||||||
|
- "DYLD_LIBRARY_PATH"
|
||||||
|
- } else if cfg!(target_os = "haiku") {
|
||||||
|
- "LIBRARY_PATH"
|
||||||
|
- } else {
|
||||||
|
- "LD_LIBRARY_PATH"
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
/// The platform-specific library name
|
||||||
|
pub fn get_lib_name(lib: &str, dylib: bool) -> String {
|
||||||
|
// In some casess (e.g. MUSL), we build a static
|
||||||
|
@@ -1826,16 +1814,7 @@ fn compose_and_run(
|
||||||
|
|
||||||
|
// Need to be sure to put both the lib_path and the aux path in the dylib
|
||||||
|
// search path for the child.
|
||||||
|
- let mut path =
|
||||||
|
- env::split_paths(&env::var_os(dylib_env_var()).unwrap_or_default()).collect::<Vec<_>>();
|
||||||
|
- if let Some(p) = aux_path {
|
||||||
|
- path.insert(0, PathBuf::from(p))
|
||||||
|
- }
|
||||||
|
- path.insert(0, PathBuf::from(lib_path));
|
||||||
|
-
|
||||||
|
- // Add the new dylib search path var
|
||||||
|
- let newpath = env::join_paths(&path).unwrap();
|
||||||
|
- command.env(dylib_env_var(), newpath);
|
||||||
|
+ add_dylib_path(&mut command, iter::once(lib_path).chain(aux_path));
|
||||||
|
|
||||||
|
let mut child = disable_error_reporting(|| command.spawn())
|
||||||
|
.unwrap_or_else(|_| panic!("failed to exec `{:?}`", &command));
|
||||||
|
diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
|
||||||
|
index 9d047b63c859..4b73be0fbb90 100644
|
||||||
|
--- a/src/tools/compiletest/src/util.rs
|
||||||
|
+++ b/src/tools/compiletest/src/util.rs
|
||||||
|
@@ -2,6 +2,7 @@
|
||||||
|
use std::env;
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
+use std::process::Command;
|
||||||
|
|
||||||
|
use tracing::*;
|
||||||
|
|
||||||
|
@@ -105,3 +106,25 @@ fn with_extra_extension<S: AsRef<OsStr>>(&self, extension: S) -> PathBuf {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+/// The name of the environment variable that holds dynamic library locations.
|
||||||
|
+pub fn dylib_env_var() -> &'static str {
|
||||||
|
+ if cfg!(windows) {
|
||||||
|
+ "PATH"
|
||||||
|
+ } else if cfg!(target_os = "macos") {
|
||||||
|
+ "DYLD_LIBRARY_PATH"
|
||||||
|
+ } else if cfg!(target_os = "haiku") {
|
||||||
|
+ "LIBRARY_PATH"
|
||||||
|
+ } else {
|
||||||
|
+ "LD_LIBRARY_PATH"
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.
|
||||||
|
+/// If the dylib_path_var is already set for this cmd, the old value will be overwritten!
|
||||||
|
+pub fn add_dylib_path(cmd: &mut Command, paths: impl Iterator<Item = impl Into<PathBuf>>) {
|
||||||
|
+ let path_env = env::var_os(dylib_env_var());
|
||||||
|
+ let old_paths = path_env.as_ref().map(env::split_paths);
|
||||||
|
+ let new_paths = paths.map(Into::into).chain(old_paths.into_iter().flatten());
|
||||||
|
+ cmd.env(dylib_env_var(), env::join_paths(new_paths).unwrap());
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.37.3
|
||||||
|
|
@ -0,0 +1,52 @@
|
|||||||
|
From a72666ed56ec5f1b6d254c7020cf86143edc6dbd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Tue, 20 Sep 2022 13:03:43 -0700
|
||||||
|
Subject: [PATCH] rustc_transmute: fix big-endian discriminants
|
||||||
|
|
||||||
|
---
|
||||||
|
compiler/rustc_transmute/src/layout/tree.rs | 22 +++++++++++++++------
|
||||||
|
1 file changed, 16 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_transmute/src/layout/tree.rs b/compiler/rustc_transmute/src/layout/tree.rs
|
||||||
|
index 211c813b8001..acd4fa63d782 100644
|
||||||
|
--- a/compiler/rustc_transmute/src/layout/tree.rs
|
||||||
|
+++ b/compiler/rustc_transmute/src/layout/tree.rs
|
||||||
|
@@ -404,7 +404,7 @@ fn from_repr_c_variant(
|
||||||
|
.unwrap();
|
||||||
|
trace!(?discr_layout, "computed discriminant layout");
|
||||||
|
variant_layout = variant_layout.extend(discr_layout).unwrap().0;
|
||||||
|
- tree = tree.then(Self::from_disr(discr, tcx, layout_summary.discriminant_size));
|
||||||
|
+ tree = tree.then(Self::from_discr(discr, tcx, layout_summary.discriminant_size));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Next come fields.
|
||||||
|
@@ -444,11 +444,21 @@ fn from_repr_c_variant(
|
||||||
|
Ok(tree)
|
||||||
|
}
|
||||||
|
|
||||||
|
- pub fn from_disr(discr: Discr<'tcx>, tcx: TyCtxt<'tcx>, size: usize) -> Self {
|
||||||
|
- // FIXME(@jswrenn): I'm certain this is missing needed endian nuance.
|
||||||
|
- let bytes = discr.val.to_ne_bytes();
|
||||||
|
- let bytes = &bytes[..size];
|
||||||
|
- Self::Seq(bytes.into_iter().copied().map(|b| Self::from_bits(b)).collect())
|
||||||
|
+ pub fn from_discr(discr: Discr<'tcx>, tcx: TyCtxt<'tcx>, size: usize) -> Self {
|
||||||
|
+ use rustc_target::abi::Endian;
|
||||||
|
+
|
||||||
|
+ let bytes: [u8; 16];
|
||||||
|
+ let bytes = match tcx.data_layout.endian {
|
||||||
|
+ Endian::Little => {
|
||||||
|
+ bytes = discr.val.to_le_bytes();
|
||||||
|
+ &bytes[..size]
|
||||||
|
+ }
|
||||||
|
+ Endian::Big => {
|
||||||
|
+ bytes = discr.val.to_be_bytes();
|
||||||
|
+ &bytes[bytes.len() - size..]
|
||||||
|
+ }
|
||||||
|
+ };
|
||||||
|
+ Self::Seq(bytes.iter().map(|&b| Self::from_bits(b)).collect())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.37.3
|
||||||
|
|
@ -1,98 +0,0 @@
|
|||||||
From 21d53eca2af5f04c0aa6b898f99f58e0e093cfdd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Thu, 28 Sep 2023 18:18:16 -0700
|
|
||||||
Subject: [PATCH 2/2] set an external library path for wasm32-wasi
|
|
||||||
|
|
||||||
---
|
|
||||||
compiler/rustc_codegen_ssa/src/back/link.rs | 10 ++++++++++
|
|
||||||
compiler/rustc_target/src/spec/mod.rs | 4 ++++
|
|
||||||
.../rustc_target/src/spec/targets/wasm32_wasip1.rs | 7 ++++---
|
|
||||||
3 files changed, 18 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
index 5149e3a12f23..cf62fbdc7f59 100644
|
|
||||||
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
@@ -1663,6 +1663,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
|
|
||||||
return file_path;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ if let Some(lib_path) = &sess.target.options.external_lib_path {
|
|
||||||
+ let file_path = Path::new(lib_path.as_ref()).join(name);
|
|
||||||
+ if file_path.exists() {
|
|
||||||
+ return file_path;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
for search_path in sess.target_filesearch().search_paths(PathKind::Native) {
|
|
||||||
let file_path = search_path.dir.join(name);
|
|
||||||
if file_path.exists() {
|
|
||||||
@@ -2163,6 +2169,10 @@ fn add_library_search_dirs(
|
|
||||||
ControlFlow::<()>::Continue(())
|
|
||||||
},
|
|
||||||
);
|
|
||||||
+
|
|
||||||
+ if let Some(lib_path) = &sess.target.options.external_lib_path {
|
|
||||||
+ cmd.include_path(Path::new(lib_path.as_ref()));
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Add options making relocation sections in the produced ELF files read-only
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
|
|
||||||
index 321ab40403a3..54791c8892d8 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/mod.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/mod.rs
|
|
||||||
@@ -2155,6 +2155,7 @@ pub struct TargetOptions {
|
|
||||||
/// Objects to link before and after all other object code.
|
|
||||||
pub pre_link_objects: CrtObjects,
|
|
||||||
pub post_link_objects: CrtObjects,
|
|
||||||
+ pub external_lib_path: Option<StaticCow<str>>,
|
|
||||||
/// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
|
|
||||||
pub pre_link_objects_self_contained: CrtObjects,
|
|
||||||
pub post_link_objects_self_contained: CrtObjects,
|
|
||||||
@@ -2651,6 +2652,7 @@ fn default() -> TargetOptions {
|
|
||||||
relro_level: RelroLevel::None,
|
|
||||||
pre_link_objects: Default::default(),
|
|
||||||
post_link_objects: Default::default(),
|
|
||||||
+ external_lib_path: None,
|
|
||||||
pre_link_objects_self_contained: Default::default(),
|
|
||||||
post_link_objects_self_contained: Default::default(),
|
|
||||||
link_self_contained: LinkSelfContainedDefault::False,
|
|
||||||
@@ -3355,6 +3357,7 @@ macro_rules! key {
|
|
||||||
key!(linker_is_gnu_json = "linker-is-gnu", bool);
|
|
||||||
key!(pre_link_objects = "pre-link-objects", link_objects);
|
|
||||||
key!(post_link_objects = "post-link-objects", link_objects);
|
|
||||||
+ key!(external_lib_path, optional);
|
|
||||||
key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects);
|
|
||||||
key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects);
|
|
||||||
// Deserializes the backwards-compatible variants of `-Clink-self-contained`
|
|
||||||
@@ -3636,6 +3639,7 @@ macro_rules! target_option_val {
|
|
||||||
target_option_val!(linker_is_gnu_json, "linker-is-gnu");
|
|
||||||
target_option_val!(pre_link_objects);
|
|
||||||
target_option_val!(post_link_objects);
|
|
||||||
+ target_option_val!(external_lib_path);
|
|
||||||
target_option_val!(pre_link_objects_self_contained, "pre-link-objects-fallback");
|
|
||||||
target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback");
|
|
||||||
target_option_val!(link_args - pre_link_args_json, "pre-link-args");
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
|
|
||||||
index 1cd30f21bec1..9a752d5712a6 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
|
|
||||||
@@ -19,11 +19,12 @@ pub(crate) fn target() -> Target {
|
|
||||||
options.env = "p1".into();
|
|
||||||
options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasip1"]);
|
|
||||||
|
|
||||||
- options.pre_link_objects_self_contained = crt_objects::pre_wasi_self_contained();
|
|
||||||
- options.post_link_objects_self_contained = crt_objects::post_wasi_self_contained();
|
|
||||||
+ options.pre_link_objects = crt_objects::pre_wasi_self_contained();
|
|
||||||
+ options.post_link_objects = crt_objects::post_wasi_self_contained();
|
|
||||||
|
|
||||||
// FIXME: Figure out cases in which WASM needs to link with a native toolchain.
|
|
||||||
- options.link_self_contained = LinkSelfContainedDefault::True;
|
|
||||||
+ options.link_self_contained = LinkSelfContainedDefault::False;
|
|
||||||
+ options.external_lib_path = Some("/usr/wasm32-wasi/lib/wasm32-wasi".into());
|
|
||||||
|
|
||||||
// Right now this is a bit of a workaround but we're currently saying that
|
|
||||||
// the target by default has a static crt which we're taking as a signal
|
|
||||||
--
|
|
||||||
2.47.1
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
|||||||
%__cargo_vendor_path ^%{_defaultlicensedir}(/[^/]+)+/cargo-vendor.txt$
|
|
||||||
%__cargo_vendor_provides %{_rpmconfigdir}/cargo_vendor.prov
|
|
@ -1,127 +0,0 @@
|
|||||||
#! /usr/bin/python3 -s
|
|
||||||
# Stripped down replacement for cargo2rpm parse-vendor-manifest
|
|
||||||
|
|
||||||
import re
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
|
|
||||||
VERSION_REGEX = re.compile(
|
|
||||||
r"""
|
|
||||||
^
|
|
||||||
(?P<major>0|[1-9]\d*)
|
|
||||||
\.(?P<minor>0|[1-9]\d*)
|
|
||||||
\.(?P<patch>0|[1-9]\d*)
|
|
||||||
(?:-(?P<pre>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?
|
|
||||||
(?:\+(?P<build>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
|
|
||||||
""",
|
|
||||||
re.VERBOSE,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Version:
|
|
||||||
"""
|
|
||||||
Version that adheres to the "semantic versioning" format.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, major: int, minor: int, patch: int, pre: Optional[str] = None, build: Optional[str] = None):
|
|
||||||
self.major: int = major
|
|
||||||
self.minor: int = minor
|
|
||||||
self.patch: int = patch
|
|
||||||
self.pre: Optional[str] = pre
|
|
||||||
self.build: Optional[str] = build
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(version: str) -> "Version":
|
|
||||||
"""
|
|
||||||
Parses a version string and return a `Version` object.
|
|
||||||
Raises a `ValueError` if the string does not match the expected format.
|
|
||||||
"""
|
|
||||||
|
|
||||||
match = VERSION_REGEX.match(version)
|
|
||||||
if not match:
|
|
||||||
raise ValueError(f"Invalid version: {version!r}")
|
|
||||||
|
|
||||||
matches = match.groupdict()
|
|
||||||
|
|
||||||
major_str = matches["major"]
|
|
||||||
minor_str = matches["minor"]
|
|
||||||
patch_str = matches["patch"]
|
|
||||||
pre = matches["pre"]
|
|
||||||
build = matches["build"]
|
|
||||||
|
|
||||||
major = int(major_str)
|
|
||||||
minor = int(minor_str)
|
|
||||||
patch = int(patch_str)
|
|
||||||
|
|
||||||
return Version(major, minor, patch, pre, build)
|
|
||||||
|
|
||||||
def to_rpm(self) -> str:
|
|
||||||
"""
|
|
||||||
Formats the `Version` object as an equivalent RPM version string.
|
|
||||||
Characters that are invalid in RPM versions are replaced ("-" -> "_")
|
|
||||||
|
|
||||||
Build metadata (the optional `Version.build` attribute) is dropped, so
|
|
||||||
the conversion is not lossless for versions where this attribute is not
|
|
||||||
`None`. However, build metadata is not intended to be part of the
|
|
||||||
version (and is not even considered when doing version comparison), so
|
|
||||||
dropping it when converting to the RPM version format is correct.
|
|
||||||
"""
|
|
||||||
|
|
||||||
s = f"{self.major}.{self.minor}.{self.patch}"
|
|
||||||
if self.pre:
|
|
||||||
s += f"~{self.pre.replace('-', '_')}"
|
|
||||||
return s
|
|
||||||
|
|
||||||
|
|
||||||
def break_the_build(error: str):
|
|
||||||
"""
|
|
||||||
This function writes a string that is an invalid RPM dependency specifier,
|
|
||||||
which causes dependency generators to fail and break the build. The
|
|
||||||
additional error message is printed to stderr.
|
|
||||||
"""
|
|
||||||
|
|
||||||
print("*** FATAL ERROR ***")
|
|
||||||
print(error, file=sys.stderr)
|
|
||||||
|
|
||||||
|
|
||||||
def get_cargo_vendor_txt_paths_from_stdin() -> set[str]: # pragma nocover
|
|
||||||
"""
|
|
||||||
Read lines from standard input and filter out lines that look like paths
|
|
||||||
to `cargo-vendor.txt` files. This is how RPM generators pass lists of files.
|
|
||||||
"""
|
|
||||||
|
|
||||||
lines = {line.rstrip("\n") for line in sys.stdin.readlines()}
|
|
||||||
return {line for line in lines if line.endswith("/cargo-vendor.txt")}
|
|
||||||
|
|
||||||
|
|
||||||
def action_parse_vendor_manifest():
|
|
||||||
paths = get_cargo_vendor_txt_paths_from_stdin()
|
|
||||||
|
|
||||||
for path in paths:
|
|
||||||
with open(path) as file:
|
|
||||||
manifest = file.read()
|
|
||||||
|
|
||||||
for line in manifest.strip().splitlines():
|
|
||||||
crate, version = line.split(" v")
|
|
||||||
print(f"bundled(crate({crate})) = {Version.parse(version).to_rpm()}")
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
try:
|
|
||||||
action_parse_vendor_manifest()
|
|
||||||
exit(0)
|
|
||||||
|
|
||||||
# print an error message that is not a valid RPM dependency
|
|
||||||
# to cause the generator to break the build
|
|
||||||
except (IOError, ValueError) as exc:
|
|
||||||
break_the_build(str(exc))
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
break_the_build("Uncaught exception: This should not happen, please report a bug.")
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
@ -1,92 +1,29 @@
|
|||||||
# __rustc: path to the default rustc executable
|
# Explicitly use bindir tools, in case others are in the PATH,
|
||||||
%__rustc /usr/bin/rustc
|
# like the rustup shims in a user's ~/.cargo/bin/.
|
||||||
|
#
|
||||||
|
# Since cargo 1.31, install only uses $CARGO_HOME/config, ignoring $PWD.
|
||||||
|
# https://github.com/rust-lang/cargo/issues/6397
|
||||||
|
# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
|
||||||
|
# it never writes to ~/.cargo during rpmbuild.
|
||||||
|
%__cargo %{_bindir}/env CARGO_HOME=.cargo %{_bindir}/cargo
|
||||||
|
%__rustc %{_bindir}/rustc
|
||||||
|
%__rustdoc %{_bindir}/rustdoc
|
||||||
|
|
||||||
# __rustdoc: path to the default rustdoc executable
|
# Enable optimization, debuginfo, and link hardening.
|
||||||
%__rustdoc /usr/bin/rustdoc
|
%__global_rustflags -Copt-level=3 -Cdebuginfo=2 -Clink-arg=-Wl,-z,relro,-z,now
|
||||||
|
|
||||||
# rustflags_opt_level: default optimization level
|
%__global_rustflags_toml [%{lua:
|
||||||
#
|
for arg in string.gmatch(rpm.expand("%{__global_rustflags}"), "%S+") do
|
||||||
# It corresponds to the "-Copt-level" rustc command line option.
|
print('"' .. arg .. '", ')
|
||||||
%rustflags_opt_level 3
|
end}]
|
||||||
|
|
||||||
# rustflags_debuginfo: default verbosity of debug information
|
%cargo_prep(V:) (\
|
||||||
#
|
%{__mkdir} -p .cargo \
|
||||||
# It corresponds to the "-Cdebuginfo" rustc command line option.
|
cat > .cargo/config << EOF \
|
||||||
# In some cases, it might be required to override this macro with "1" or even
|
|
||||||
# "0", if memory usage gets too high during builds on some resource-constrained
|
|
||||||
# architectures (most likely on 32-bit architectures), which will however
|
|
||||||
# reduce the quality of the produced debug symbols.
|
|
||||||
%rustflags_debuginfo 2
|
|
||||||
|
|
||||||
# rustflags_codegen_units: default number of parallel code generation units
|
|
||||||
#
|
|
||||||
# The default value of "1" results in generation of better code, but comes at
|
|
||||||
# the cost of longer build times.
|
|
||||||
%rustflags_codegen_units 1
|
|
||||||
|
|
||||||
# build_rustflags: default compiler flags for rustc (RUSTFLAGS)
|
|
||||||
#
|
|
||||||
# -Copt-level: set optimization level (default: highest optimization level)
|
|
||||||
# -Cdebuginfo: set debuginfo verbosity (default: full debug information)
|
|
||||||
# -Ccodegen-units: set number of parallel code generation units (default: 1)
|
|
||||||
#
|
|
||||||
# ref. https://doc.rust-lang.org/rustc/codegen-options/index.html
|
|
||||||
%build_rustflags %{shrink:
|
|
||||||
-Copt-level=%rustflags_opt_level
|
|
||||||
-Cdebuginfo=%rustflags_debuginfo
|
|
||||||
-Ccodegen-units=%rustflags_codegen_units
|
|
||||||
-Cstrip=none
|
|
||||||
}
|
|
||||||
|
|
||||||
# __cargo: cargo command with environment variables
|
|
||||||
#
|
|
||||||
# CARGO_HOME: This ensures cargo reads configuration file from .cargo/config.toml,
|
|
||||||
# and prevents writing any files to $HOME during RPM builds.
|
|
||||||
%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo
|
|
||||||
|
|
||||||
# __cargo_common_opts: common command line flags for cargo
|
|
||||||
#
|
|
||||||
# _smp_mflags: run builds and tests in parallel
|
|
||||||
%__cargo_common_opts %{?_smp_mflags}
|
|
||||||
|
|
||||||
# cargo_prep: macro to set up build environment for cargo projects
|
|
||||||
#
|
|
||||||
# This involves four steps:
|
|
||||||
# - create the ".cargo" directory if it doesn't exist yet
|
|
||||||
# - dump custom cargo configuration into ".cargo/config.toml"
|
|
||||||
# - remove "Cargo.lock" if it exists (it breaks builds with custom cargo config)
|
|
||||||
# - remove "Cargo.toml.orig" if it exists (it breaks running "cargo package")
|
|
||||||
#
|
|
||||||
# Options:
|
|
||||||
# -V <number> - unpack and use vendored sources from Source<number> tarball
|
|
||||||
# (deprecated; use -v instead)
|
|
||||||
# -v <directory> - use vendored sources from <directory>
|
|
||||||
# -N - Don't set up any registry. Only set up the build configuration.
|
|
||||||
%cargo_prep(V:v:N)\
|
|
||||||
%{-v:%{-V:%{error:-v and -V are mutually exclusive!}}}\
|
|
||||||
%{-v:%{-N:%{error:-v and -N are mutually exclusive!}}}\
|
|
||||||
(\
|
|
||||||
set -euo pipefail\
|
|
||||||
%{__mkdir} -p target/rpm\
|
|
||||||
/usr/bin/ln -s rpm target/release\
|
|
||||||
%{__rm} -rf .cargo/\
|
|
||||||
%{__mkdir} -p .cargo\
|
|
||||||
cat > .cargo/config.toml << EOF\
|
|
||||||
[build]\
|
[build]\
|
||||||
rustc = "%{__rustc}"\
|
rustc = "%{__rustc}"\
|
||||||
rustdoc = "%{__rustdoc}"\
|
rustdoc = "%{__rustdoc}"\
|
||||||
\
|
rustflags = %{__global_rustflags_toml}\
|
||||||
[profile.rpm]\
|
|
||||||
inherits = "release"\
|
|
||||||
opt-level = %{rustflags_opt_level}\
|
|
||||||
codegen-units = %{rustflags_codegen_units}\
|
|
||||||
debug = %{rustflags_debuginfo}\
|
|
||||||
strip = "none"\
|
|
||||||
\
|
|
||||||
[env]\
|
|
||||||
CFLAGS = "%{build_cflags}"\
|
|
||||||
CXXFLAGS = "%{build_cxxflags}"\
|
|
||||||
LDFLAGS = "%{build_ldflags}"\
|
|
||||||
\
|
\
|
||||||
[install]\
|
[install]\
|
||||||
root = "%{buildroot}%{_prefix}"\
|
root = "%{buildroot}%{_prefix}"\
|
||||||
@ -94,151 +31,21 @@ root = "%{buildroot}%{_prefix}"\
|
|||||||
[term]\
|
[term]\
|
||||||
verbose = true\
|
verbose = true\
|
||||||
EOF\
|
EOF\
|
||||||
%{-V:%{__tar} -xoaf %{S:%{-V*}}}\
|
%if 0%{-V:1}\
|
||||||
%{!?-N:\
|
%{__tar} -xoaf %{S:%{-V*}}\
|
||||||
cat >> .cargo/config.toml << EOF\
|
cat >> .cargo/config << EOF \
|
||||||
[source.vendored-sources]\
|
|
||||||
directory = "%{-v*}%{-V:./vendor}"\
|
|
||||||
\
|
\
|
||||||
[source.crates-io]\
|
[source.crates-io]\
|
||||||
registry = "https://crates.io"\
|
|
||||||
replace-with = "vendored-sources"\
|
replace-with = "vendored-sources"\
|
||||||
EOF}\
|
\
|
||||||
%{__rm} -f Cargo.toml.orig\
|
[source.vendored-sources]\
|
||||||
|
directory = "./vendor"\
|
||||||
|
EOF\
|
||||||
|
%endif\
|
||||||
)
|
)
|
||||||
|
|
||||||
# __cargo_parse_opts: function-like macro which parses common flags into the
|
%cargo_build %__cargo build --release %{?_smp_mflags}
|
||||||
# equivalent command-line flags for cargo
|
|
||||||
%__cargo_parse_opts(naf:) %{shrink:\
|
|
||||||
%{-n:%{-a:%{error:Can't specify both -n and -a}}} \
|
|
||||||
%{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}} \
|
|
||||||
%{-n:--no-default-features} \
|
|
||||||
%{-a:--all-features} \
|
|
||||||
%{-f:--features %{-f*}} \
|
|
||||||
%{nil} \
|
|
||||||
}
|
|
||||||
|
|
||||||
# NB: cargo_build/test/install do not use the -n/-a/-f argument parsing like
|
%cargo_test %__cargo test --release %{?_smp_mflags} --no-fail-fast
|
||||||
# Fedora's rust-packaging, because that change would break anyone that's
|
|
||||||
# already passing arguments directly to cargo after the macro. Instead, one can
|
|
||||||
# explicitly use --no-default-features, --all-features, or --features XYZ.
|
|
||||||
|
|
||||||
# cargo_build: builds the crate with cargo
|
|
||||||
%cargo_build\
|
|
||||||
%{shrink: \
|
|
||||||
%{__cargo} build \
|
|
||||||
%{__cargo_common_opts} \
|
|
||||||
--profile rpm \
|
|
||||||
}
|
|
||||||
|
|
||||||
# cargo_test: runs the test suite with cargo
|
|
||||||
#
|
|
||||||
# To pass command-line arguments to the cargo test runners directly (for
|
|
||||||
# example, to skip certain tests during package builds), the
|
|
||||||
# "cargo test" argument parsing need to be bypassed,
|
|
||||||
# i.e. "%%cargo_test -- --skip foo" for skipping all tests with names that
|
|
||||||
# match "foo".
|
|
||||||
%cargo_test\
|
|
||||||
%{shrink: \
|
|
||||||
%{__cargo} test \
|
|
||||||
%{__cargo_common_opts} \
|
|
||||||
--profile rpm \
|
|
||||||
--no-fail-fast \
|
|
||||||
}
|
|
||||||
|
|
||||||
# cargo_install: install files into the buildroot
|
|
||||||
#
|
|
||||||
# For "binary" crates, this macro installs all "bin" build targets to _bindir
|
|
||||||
# inside the buildroot. The "--no-track" option prevents the creation of the
|
|
||||||
# "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
|
|
||||||
# of a specific binary has been installed, but which conflicts between builds
|
|
||||||
# of different Rust applications and is not needed when building RPM packages.
|
|
||||||
%cargo_install\
|
|
||||||
%{shrink: \
|
|
||||||
%{__cargo} install \
|
|
||||||
%{__cargo_common_opts} \
|
|
||||||
--profile rpm \
|
|
||||||
--no-track \
|
|
||||||
--path . \
|
|
||||||
}
|
|
||||||
|
|
||||||
# cargo_license: print license information for all crate dependencies
|
|
||||||
#
|
|
||||||
# The "no-build,no-dev,no-proc-macro" argument results in only crates which are
|
|
||||||
# linked into the final binary to be considered.
|
|
||||||
#
|
|
||||||
# Additionally, deprecated SPDX syntax ("/" instead of "OR") is normalized
|
|
||||||
# before sorting the results to ensure reproducible output of this macro.
|
|
||||||
#
|
|
||||||
# This macro must be called with the same feature flags as other cargo macros,
|
|
||||||
# in particular, "cargo_build", otherwise its output will be incomplete.
|
|
||||||
#
|
|
||||||
# The "cargo tree" command called by this macro will fail if there are missing
|
|
||||||
# (optional) dependencies.
|
|
||||||
%cargo_license(naf:)\
|
|
||||||
(\
|
|
||||||
set -euo pipefail\
|
|
||||||
%{shrink: \
|
|
||||||
%{__cargo} tree \
|
|
||||||
--workspace \
|
|
||||||
--offline \
|
|
||||||
--edges no-build,no-dev,no-proc-macro \
|
|
||||||
--no-dedupe \
|
|
||||||
%{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
|
|
||||||
--prefix none \
|
|
||||||
--format "{l}: {p}" \
|
|
||||||
| sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "s:/: OR :g" \
|
|
||||||
| sort -u \
|
|
||||||
}\
|
|
||||||
)
|
|
||||||
|
|
||||||
# cargo_license_summary: print license summary for all crate dependencies
|
|
||||||
#
|
|
||||||
# This macro works in the same way as cargo_license, except that it only prints
|
|
||||||
# a list of licenses, and not the complete license information for every crate
|
|
||||||
# in the dependency tree. This is useful for determining the correct License
|
|
||||||
# tag for packages that contain compiled Rust binaries.
|
|
||||||
%cargo_license_summary(naf:)\
|
|
||||||
(\
|
|
||||||
set -euo pipefail\
|
|
||||||
%{shrink: \
|
|
||||||
%{__cargo} tree \
|
|
||||||
--workspace \
|
|
||||||
--offline \
|
|
||||||
--edges no-build,no-dev,no-proc-macro \
|
|
||||||
--no-dedupe \
|
|
||||||
%{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
|
|
||||||
--prefix none \
|
|
||||||
--format "# {l}" \
|
|
||||||
| sed -e "s: / :/:g" -e "s:/: OR :g" \
|
|
||||||
| sort -u \
|
|
||||||
}\
|
|
||||||
)
|
|
||||||
|
|
||||||
# cargo_vendor_manifest: write list of vendored crates and their versions
|
|
||||||
#
|
|
||||||
# The arguments for the internal "cargo tree" call emulate the logic
|
|
||||||
# that determines which crates are included when running "cargo vendor".
|
|
||||||
# The results are written to "cargo-vendor.txt".
|
|
||||||
#
|
|
||||||
# TODO: --all-features may be overly broad; this should be modified to
|
|
||||||
# use %%__cargo_parse_opts to handle feature flags.
|
|
||||||
%cargo_vendor_manifest()\
|
|
||||||
(\
|
|
||||||
set -euo pipefail\
|
|
||||||
%{shrink: \
|
|
||||||
%{__cargo} tree \
|
|
||||||
--workspace \
|
|
||||||
--offline \
|
|
||||||
--edges normal,build \
|
|
||||||
--no-dedupe \
|
|
||||||
--all-features \
|
|
||||||
--prefix none \
|
|
||||||
--format "{p}" \
|
|
||||||
| grep -v "$(pwd)" \
|
|
||||||
| sed -e "s: (proc-macro)::" \
|
|
||||||
| sort -u \
|
|
||||||
> cargo-vendor.txt \
|
|
||||||
}\
|
|
||||||
)
|
|
||||||
|
|
||||||
|
%cargo_install %__cargo install --no-track --path .
|
||||||
|
18
SOURCES/rustc-1.61.0-rust-gdb-substitute-path.patch
Normal file
18
SOURCES/rustc-1.61.0-rust-gdb-substitute-path.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
--- rustc-1.61.0-src/src/etc/rust-gdb.orig 2022-05-17 18:29:36.000000000 -0700
|
||||||
|
+++ rustc-1.61.0-src/src/etc/rust-gdb 2022-05-18 11:18:13.732709661 -0700
|
||||||
|
@@ -14,6 +14,9 @@ fi
|
||||||
|
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
|
||||||
|
GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
|
||||||
|
|
||||||
|
+RUST_STD_BUILD="@BUILDDIR@/library/"
|
||||||
|
+RUST_STD_SRC="$RUSTC_SYSROOT/lib/rustlib/src/rust/library/"
|
||||||
|
+
|
||||||
|
# Run GDB with the additional arguments that load the pretty printers
|
||||||
|
# Set the environment variable `RUST_GDB` to overwrite the call to a
|
||||||
|
# different/specific command (defaults to `gdb`).
|
||||||
|
@@ -21,4 +24,5 @@ RUST_GDB="${RUST_GDB:-gdb}"
|
||||||
|
PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
|
||||||
|
--directory="$GDB_PYTHON_MODULE_DIRECTORY" \
|
||||||
|
-iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
|
||||||
|
+ -iex "set substitute-path $RUST_STD_BUILD $RUST_STD_SRC" \
|
||||||
|
"$@"
|
90
SOURCES/rustc-1.65.0-disable-http2.patch
Normal file
90
SOURCES/rustc-1.65.0-disable-http2.patch
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
--- rustc-beta-src/Cargo.lock.orig 2022-10-04 10:55:48.797517289 -0700
|
||||||
|
+++ rustc-beta-src/Cargo.lock 2022-10-04 10:55:48.799517248 -0700
|
||||||
|
@@ -1026,7 +1026,6 @@
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
- "libnghttp2-sys",
|
||||||
|
"libz-sys",
|
||||||
|
"openssl-sys",
|
||||||
|
"pkg-config",
|
||||||
|
@@ -1993,16 +1992,6 @@
|
||||||
|
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
-name = "libnghttp2-sys"
|
||||||
|
-version = "0.1.4+1.41.0"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
|
||||||
|
-dependencies = [
|
||||||
|
- "cc",
|
||||||
|
- "libc",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
name = "libz-sys"
|
||||||
|
version = "1.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2022-10-04 10:55:48.799517248 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2022-10-04 11:00:55.057162743 -0700
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
|
||||||
|
cargo-util = { path = "crates/cargo-util", version = "0.2.1" }
|
||||||
|
crates-io = { path = "crates/crates-io", version = "0.34.0" }
|
||||||
|
-curl = { version = "0.4.43", features = ["http2"] }
|
||||||
|
+curl = { version = "0.4.43", features = [] }
|
||||||
|
curl-sys = "0.4.55"
|
||||||
|
env_logger = "0.9.0"
|
||||||
|
pretty_env_logger = { version = "0.4", optional = true }
|
||||||
|
--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig 2022-09-24 10:23:17.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs 2022-10-04 10:55:48.799517248 -0700
|
||||||
|
@@ -192,16 +192,8 @@
|
||||||
|
}
|
||||||
|
self.fetch_started = true;
|
||||||
|
|
||||||
|
- // We've enabled the `http2` feature of `curl` in Cargo, so treat
|
||||||
|
- // failures here as fatal as it would indicate a build-time problem.
|
||||||
|
- self.multiplexing = self.config.http_config()?.multiplexing.unwrap_or(true);
|
||||||
|
-
|
||||||
|
- self.multi
|
||||||
|
- .pipelining(false, self.multiplexing)
|
||||||
|
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
|
||||||
|
-
|
||||||
|
- // let's not flood the server with connections
|
||||||
|
- self.multi.set_max_host_connections(2)?;
|
||||||
|
+ // Multiplexing is disabled because the system libcurl doesn't support it.
|
||||||
|
+ self.multiplexing = false;
|
||||||
|
|
||||||
|
self.config
|
||||||
|
.shell()
|
||||||
|
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2022-09-24 10:23:17.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2022-10-04 10:55:48.800517227 -0700
|
||||||
|
@@ -403,16 +403,9 @@
|
||||||
|
sources: SourceMap<'cfg>,
|
||||||
|
config: &'cfg Config,
|
||||||
|
) -> CargoResult<PackageSet<'cfg>> {
|
||||||
|
- // We've enabled the `http2` feature of `curl` in Cargo, so treat
|
||||||
|
- // failures here as fatal as it would indicate a build-time problem.
|
||||||
|
- let mut multi = Multi::new();
|
||||||
|
- let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
|
||||||
|
- multi
|
||||||
|
- .pipelining(false, multiplexing)
|
||||||
|
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
|
||||||
|
-
|
||||||
|
- // let's not flood crates.io with connections
|
||||||
|
- multi.set_max_host_connections(2)?;
|
||||||
|
+ // Multiplexing is disabled because the system libcurl doesn't support it.
|
||||||
|
+ let multi = Multi::new();
|
||||||
|
+ let multiplexing = false;
|
||||||
|
|
||||||
|
Ok(PackageSet {
|
||||||
|
packages: package_ids
|
||||||
|
@@ -658,7 +651,7 @@
|
||||||
|
macro_rules! try_old_curl {
|
||||||
|
($e:expr, $msg:expr) => {
|
||||||
|
let result = $e;
|
||||||
|
- if cfg!(target_os = "macos") {
|
||||||
|
+ if cfg!(any(target_os = "linux", target_os = "macos")) {
|
||||||
|
if let Err(e) = result {
|
||||||
|
warn!("ignoring libcurl {} error: {}", $msg, e);
|
||||||
|
}
|
43
SOURCES/rustc-1.65.0-disable-libssh2.patch
Normal file
43
SOURCES/rustc-1.65.0-disable-libssh2.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
--- rustc-beta-src/Cargo.lock.orig 2022-09-24 10:20:14.000000000 -0700
|
||||||
|
+++ rustc-beta-src/Cargo.lock 2022-10-04 10:26:35.490270607 -0700
|
||||||
|
@@ -1971,7 +1971,6 @@
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
- "libssh2-sys",
|
||||||
|
"libz-sys",
|
||||||
|
"openssl-sys",
|
||||||
|
"pkg-config",
|
||||||
|
@@ -2004,20 +2003,6 @@
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
-name = "libssh2-sys"
|
||||||
|
-version = "0.2.23"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
|
||||||
|
-dependencies = [
|
||||||
|
- "cc",
|
||||||
|
- "libc",
|
||||||
|
- "libz-sys",
|
||||||
|
- "openssl-sys",
|
||||||
|
- "pkg-config",
|
||||||
|
- "vcpkg",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
name = "libz-sys"
|
||||||
|
version = "1.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
--- rustc-beta-src/vendor/git2/Cargo.toml.orig 2022-10-04 10:26:35.490270607 -0700
|
||||||
|
+++ rustc-beta-src/vendor/git2/Cargo.toml 2022-10-04 10:28:14.002187686 -0700
|
||||||
|
@@ -58,9 +58,7 @@
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = [
|
||||||
|
- "ssh",
|
||||||
|
"https",
|
||||||
|
- "ssh_key_from_memory",
|
||||||
|
]
|
||||||
|
https = [
|
||||||
|
"libgit2-sys/https",
|
43
SOURCES/rustc-1.65.0-no-default-pie.patch
Normal file
43
SOURCES/rustc-1.65.0-no-default-pie.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
--- rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig 2022-09-24 10:20:14.000000000 -0700
|
||||||
|
+++ rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs 2022-10-05 11:24:21.759564185 -0700
|
||||||
|
@@ -755,7 +755,7 @@
|
||||||
|
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-no-pie")
|
||||||
|
{
|
||||||
|
info!("linker output: {:?}", out);
|
||||||
|
- warn!("Linker does not support -no-pie command line option. Retrying without.");
|
||||||
|
+ info!("Linker does not support -no-pie command line option. Retrying without.");
|
||||||
|
for arg in cmd.take_args() {
|
||||||
|
if arg.to_string_lossy() != "-no-pie" {
|
||||||
|
cmd.arg(arg);
|
||||||
|
@@ -774,7 +774,7 @@
|
||||||
|
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-static-pie")
|
||||||
|
{
|
||||||
|
info!("linker output: {:?}", out);
|
||||||
|
- warn!(
|
||||||
|
+ info!(
|
||||||
|
"Linker does not support -static-pie command line option. Retrying with -static instead."
|
||||||
|
);
|
||||||
|
// Mirror `add_(pre,post)_link_objects` to replace CRT objects.
|
||||||
|
@@ -1520,15 +1520,15 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
|
||||||
|
- let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
|
||||||
|
+ // Only use PIE if explicitly specified.
|
||||||
|
+ #[allow(rustc::bad_opt_access)]
|
||||||
|
+ let explicit_pic =
|
||||||
|
+ matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic | RelocModel::Pie));
|
||||||
|
+ let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
|
||||||
|
(CrateType::Executable, _, _) if sess.is_wasi_reactor() => LinkOutputKind::WasiReactorExe,
|
||||||
|
- (CrateType::Executable, false, RelocModel::Pic | RelocModel::Pie) => {
|
||||||
|
- LinkOutputKind::DynamicPicExe
|
||||||
|
- }
|
||||||
|
+ (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
|
||||||
|
(CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
|
||||||
|
- (CrateType::Executable, true, RelocModel::Pic | RelocModel::Pie) => {
|
||||||
|
- LinkOutputKind::StaticPicExe
|
||||||
|
- }
|
||||||
|
+ (CrateType::Executable, true, true) => LinkOutputKind::StaticPicExe,
|
||||||
|
(CrateType::Executable, true, _) => LinkOutputKind::StaticNoPicExe,
|
||||||
|
(_, true, _) => LinkOutputKind::StaticDylib,
|
||||||
|
(_, false, _) => LinkOutputKind::DynamicDylib,
|
@ -1,21 +0,0 @@
|
|||||||
diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
|
|
||||||
index 9abed30ea6f7..e4bf55df3688 100755
|
|
||||||
--- a/src/etc/rust-gdb
|
|
||||||
+++ b/src/etc/rust-gdb
|
|
||||||
@@ -13,8 +13,6 @@ fi
|
|
||||||
# Find out where the pretty printer Python module is
|
|
||||||
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
|
|
||||||
GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
|
|
||||||
-# Get the commit hash for path remapping
|
|
||||||
-RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
|
|
||||||
|
|
||||||
# Run GDB with the additional arguments that load the pretty printers
|
|
||||||
# Set the environment variable `RUST_GDB` to overwrite the call to a
|
|
||||||
@@ -23,6 +21,6 @@ RUST_GDB="${RUST_GDB:-gdb}"
|
|
||||||
PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
|
|
||||||
--directory="$GDB_PYTHON_MODULE_DIRECTORY" \
|
|
||||||
-iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
|
|
||||||
- -iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \
|
|
||||||
+ -iex "set substitute-path @BUILDDIR@ $RUSTC_SYSROOT/lib/rustlib/src/rust" \
|
|
||||||
"$@"
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
|||||||
diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
|
|
||||||
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-12-12 14:07:10.755481543 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-12-12 14:07:10.756481534 -0800
|
|
||||||
@@ -2272,7 +2272,6 @@ checksum = "10472326a8a6477c3c20a64547b0
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
- "libssh2-sys",
|
|
||||||
"libz-sys",
|
|
||||||
"openssl-sys",
|
|
||||||
"pkg-config",
|
|
||||||
@@ -2313,20 +2312,6 @@ dependencies = [
|
|
||||||
"pkg-config",
|
|
||||||
"vcpkg",
|
|
||||||
]
|
|
||||||
-
|
|
||||||
-[[package]]
|
|
||||||
-name = "libssh2-sys"
|
|
||||||
-version = "0.3.0"
|
|
||||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
|
|
||||||
-dependencies = [
|
|
||||||
- "cc",
|
|
||||||
- "libc",
|
|
||||||
- "libz-sys",
|
|
||||||
- "openssl-sys",
|
|
||||||
- "pkg-config",
|
|
||||||
- "vcpkg",
|
|
||||||
-]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libz-sys"
|
|
||||||
diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
|
|
||||||
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-12-12 14:07:10.756481534 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-12-12 14:07:56.866087428 -0800
|
|
||||||
@@ -47,7 +47,7 @@ curl = "0.4.46"
|
|
||||||
curl-sys = "0.4.73"
|
|
||||||
filetime = "0.2.23"
|
|
||||||
flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] }
|
|
||||||
-git2 = "0.19.0"
|
|
||||||
+git2 = { version = "0.19.0", default-features = false, features = ["https"] }
|
|
||||||
git2-curl = "0.20.0"
|
|
||||||
gix = { version = "0.67.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
|
|
||||||
glob = "0.3.1"
|
|
@ -1,23 +0,0 @@
|
|||||||
diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
|
|
||||||
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-12-07 06:47:38.000000000 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-12-12 14:02:54.412672539 -0800
|
|
||||||
@@ -2310,7 +2310,6 @@ version = "0.30.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
|
|
||||||
dependencies = [
|
|
||||||
- "cc",
|
|
||||||
"pkg-config",
|
|
||||||
"vcpkg",
|
|
||||||
]
|
|
||||||
diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
|
|
||||||
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-12-12 14:02:54.412672539 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-12-12 14:03:25.665405417 -0800
|
|
||||||
@@ -80,7 +80,7 @@ proptest = "1.5.0"
|
|
||||||
pulldown-cmark = { version = "0.12.0", default-features = false, features = ["html"] }
|
|
||||||
rand = "0.8.5"
|
|
||||||
regex = "1.10.5"
|
|
||||||
-rusqlite = { version = "0.32.0", features = ["bundled"] }
|
|
||||||
+rusqlite = { version = "0.32.0", features = [] }
|
|
||||||
rustc-hash = "2.0.0"
|
|
||||||
rustfix = { version = "0.9.0", path = "crates/rustfix" }
|
|
||||||
same-file = "1.0.6"
|
|
1027
SPECS/rust.spec
1027
SPECS/rust.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user