From 0c755bb834563e126b76d87e95c666c408f2e542 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 30 Sep 2024 09:50:32 -0700 Subject: [PATCH] Only add an automatic SONAME for Rust dylibs Fixes RHBZ#2314879 --- ...-an-automatic-SONAME-for-Rust-dylibs.patch | 234 ++++++++++++++++++ rust.spec | 4 + 2 files changed, 238 insertions(+) create mode 100644 0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch diff --git a/0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch b/0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch new file mode 100644 index 0000000..80970d1 --- /dev/null +++ b/0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch @@ -0,0 +1,234 @@ +From f46057bf1cc0dc24a0ecd7d87c9c93872e685253 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Fri, 27 Sep 2024 15:53:26 -0700 +Subject: [PATCH] Only add an automatic SONAME for Rust dylibs + +--- + compiler/rustc_codegen_ssa/src/back/link.rs | 2 +- + compiler/rustc_codegen_ssa/src/back/linker.rs | 83 +++++++++++++++---- + tests/run-make/dylib-soname/rmake.rs | 16 ++-- + 3 files changed, 80 insertions(+), 21 deletions(-) + +diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs +index 80e8111516ee..a23cc5129261 100644 +--- a/compiler/rustc_codegen_ssa/src/back/link.rs ++++ b/compiler/rustc_codegen_ssa/src/back/link.rs +@@ -2490,7 +2490,7 @@ fn add_order_independent_options( + } + } + +- cmd.set_output_kind(link_output_kind, out_filename); ++ cmd.set_output_kind(link_output_kind, crate_type, out_filename); + + add_relro_args(cmd, sess); + +diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs +index a73ec83ee62c..3f3d305da014 100644 +--- a/compiler/rustc_codegen_ssa/src/back/linker.rs ++++ b/compiler/rustc_codegen_ssa/src/back/linker.rs +@@ -275,7 +275,12 @@ pub(crate) trait Linker { + fn is_cc(&self) -> bool { + false + } +- fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path); ++ fn set_output_kind( ++ &mut self, ++ output_kind: LinkOutputKind, ++ crate_type: CrateType, ++ out_filename: &Path, ++ ); + fn link_dylib_by_name(&mut self, _name: &str, _verbatim: bool, _as_needed: bool) { + bug!("dylib linked with unsupported linker") + } +@@ -396,7 +401,7 @@ fn push_linker_plugin_lto_args(&mut self, plugin_path: Option<&OsStr>) { + ]); + } + +- fn build_dylib(&mut self, out_filename: &Path) { ++ fn build_dylib(&mut self, crate_type: CrateType, out_filename: &Path) { + // On mac we need to tell the linker to let this library be rpathed + if self.sess.target.is_like_osx { + if !self.is_ld { +@@ -427,7 +432,7 @@ fn build_dylib(&mut self, out_filename: &Path) { + let mut out_implib = OsString::from("--out-implib="); + out_implib.push(out_filename.with_file_name(implib_name)); + self.link_arg(out_implib); +- } else { ++ } else if crate_type == CrateType::Dylib { + // When dylibs are linked by a full path this value will get into `DT_NEEDED` + // instead of the full path, so the library can be later found in some other + // location than that specific path. +@@ -474,7 +479,12 @@ fn is_cc(&self) -> bool { + !self.is_ld + } + +- fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) { ++ fn set_output_kind( ++ &mut self, ++ output_kind: LinkOutputKind, ++ crate_type: CrateType, ++ out_filename: &Path, ++ ) { + match output_kind { + LinkOutputKind::DynamicNoPicExe => { + if !self.is_ld && self.is_gnu { +@@ -509,10 +519,10 @@ fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) + self.link_args(&["-static", "-pie", "--no-dynamic-linker", "-z", "text"]); + } + } +- LinkOutputKind::DynamicDylib => self.build_dylib(out_filename), ++ LinkOutputKind::DynamicDylib => self.build_dylib(crate_type, out_filename), + LinkOutputKind::StaticDylib => { + self.link_or_cc_arg("-static"); +- self.build_dylib(out_filename); ++ self.build_dylib(crate_type, out_filename); + } + LinkOutputKind::WasiReactorExe => { + self.link_args(&["--entry", "_initialize"]); +@@ -866,7 +876,12 @@ fn cmd(&mut self) -> &mut Command { + &mut self.cmd + } + +- fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) { ++ fn set_output_kind( ++ &mut self, ++ output_kind: LinkOutputKind, ++ _crate_type: CrateType, ++ out_filename: &Path, ++ ) { + match output_kind { + LinkOutputKind::DynamicNoPicExe + | LinkOutputKind::DynamicPicExe +@@ -1124,7 +1139,13 @@ fn is_cc(&self) -> bool { + true + } + +- fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {} ++ fn set_output_kind( ++ &mut self, ++ _output_kind: LinkOutputKind, ++ _crate_type: CrateType, ++ _out_filename: &Path, ++ ) { ++ } + + fn link_dylib_by_name(&mut self, name: &str, _verbatim: bool, _as_needed: bool) { + // Emscripten always links statically +@@ -1273,7 +1294,12 @@ fn cmd(&mut self) -> &mut Command { + &mut self.cmd + } + +- fn set_output_kind(&mut self, output_kind: LinkOutputKind, _out_filename: &Path) { ++ fn set_output_kind( ++ &mut self, ++ output_kind: LinkOutputKind, ++ _crate_type: CrateType, ++ _out_filename: &Path, ++ ) { + match output_kind { + LinkOutputKind::DynamicNoPicExe + | LinkOutputKind::DynamicPicExe +@@ -1422,7 +1448,13 @@ fn cmd(&mut self) -> &mut Command { + &mut self.cmd + } + +- fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {} ++ fn set_output_kind( ++ &mut self, ++ _output_kind: LinkOutputKind, ++ _crate_type: CrateType, ++ _out_filename: &Path, ++ ) { ++ } + + fn link_staticlib_by_name(&mut self, name: &str, _verbatim: bool, whole_archive: bool) { + self.hint_static(); +@@ -1568,7 +1600,12 @@ fn cmd(&mut self) -> &mut Command { + &mut self.cmd + } + +- fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) { ++ fn set_output_kind( ++ &mut self, ++ output_kind: LinkOutputKind, ++ _crate_type: CrateType, ++ out_filename: &Path, ++ ) { + match output_kind { + LinkOutputKind::DynamicDylib => { + self.hint_dynamic(); +@@ -1775,7 +1812,13 @@ fn cmd(&mut self) -> &mut Command { + &mut self.cmd + } + +- fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {} ++ fn set_output_kind( ++ &mut self, ++ _output_kind: LinkOutputKind, ++ _crate_type: CrateType, ++ _out_filename: &Path, ++ ) { ++ } + + fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) { + panic!("staticlibs not supported") +@@ -1841,7 +1884,13 @@ fn cmd(&mut self) -> &mut Command { + &mut self.cmd + } + +- fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {} ++ fn set_output_kind( ++ &mut self, ++ _output_kind: LinkOutputKind, ++ _crate_type: CrateType, ++ _out_filename: &Path, ++ ) { ++ } + + fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) { + panic!("staticlibs not supported") +@@ -1912,7 +1961,13 @@ fn cmd(&mut self) -> &mut Command { + &mut self.cmd + } + +- fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {} ++ fn set_output_kind( ++ &mut self, ++ _output_kind: LinkOutputKind, ++ _crate_type: CrateType, ++ _out_filename: &Path, ++ ) { ++ } + + fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) { + panic!("staticlibs not supported") +diff --git a/tests/run-make/dylib-soname/rmake.rs b/tests/run-make/dylib-soname/rmake.rs +index cec0d4638424..714997cbc1a1 100644 +--- a/tests/run-make/dylib-soname/rmake.rs ++++ b/tests/run-make/dylib-soname/rmake.rs +@@ -7,12 +7,16 @@ + use run_make_support::{cmd, run_in_tmpdir, rustc}; + + fn main() { ++ let check = |ty: &str| { ++ rustc().crate_name("foo").crate_type(ty).input("foo.rs").run(); ++ cmd("readelf").arg("-d").arg("libfoo.so").run() ++ }; + run_in_tmpdir(|| { +- rustc().crate_name("foo").crate_type("dylib").input("foo.rs").run(); +- cmd("readelf") +- .arg("-d") +- .arg("libfoo.so") +- .run() +- .assert_stdout_contains("Library soname: [libfoo.so]"); ++ // Rust dylibs should get a relative SONAME ++ check("dylib").assert_stdout_contains("Library soname: [libfoo.so]"); ++ }); ++ run_in_tmpdir(|| { ++ // C dylibs should not implicitly get any SONAME ++ check("cdylib").assert_stdout_not_contains("Library soname:"); + }); + } +-- +2.46.1 + diff --git a/rust.spec b/rust.spec index 29c67ef..6ae4bfc 100644 --- a/rust.spec +++ b/rust.spec @@ -162,6 +162,9 @@ Patch6: rustc-1.81.0-unbundle-sqlite.patch # https://github.com/rust-lang/rust/pull/128182 Patch7: 0001-handle-no_std-targets-on-std-builds.patch +# https://github.com/rust-lang/rust/pull/130960 +Patch8: 0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch + ### RHEL-specific patches below ### # Simple rpm macros for rust-toolset (as opposed to full rust-packaging) @@ -666,6 +669,7 @@ rm -rf %{wasi_libc_dir}/dlmalloc/ %patch -P6 -p1 %endif %patch -P7 -p1 +%patch -P8 -p1 %if %with disabled_libssh2 %patch -P100 -p1