aboutsummaryrefslogtreecommitdiffstats
path: root/community/rust/alpine-change-rpath-to-rustlib.patch
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-12-22 11:35:00 +0100
committerRasmus Thomsen <oss@cogitri.dev>2019-12-22 21:12:46 +0100
commitcbc114bc593de8ae066b599fae8a206ef4a64ed2 (patch)
treeb192b35f2fe1d921ba8cb1dcb77df724b3a4a6e4 /community/rust/alpine-change-rpath-to-rustlib.patch
parent68b7d37c26437f86c0b46fc10551020750b7c0ff (diff)
downloadaports-cbc114bc593de8ae066b599fae8a206ef4a64ed2.tar.bz2
aports-cbc114bc593de8ae066b599fae8a206ef4a64ed2.tar.xz
community/rust: don't remove libs in /usr/lib
Rust doesn't duplicate libraries anymore, so we mustn't remove libs in /usr/lib to save space. As such we also won't need the rpath patch anymore. Bootstrap from tarballs again since the version in the repos has gone bad due to this.
Diffstat (limited to 'community/rust/alpine-change-rpath-to-rustlib.patch')
-rw-r--r--community/rust/alpine-change-rpath-to-rustlib.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/community/rust/alpine-change-rpath-to-rustlib.patch b/community/rust/alpine-change-rpath-to-rustlib.patch
deleted file mode 100644
index cf2be834a4..0000000000
--- a/community/rust/alpine-change-rpath-to-rustlib.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sat, 08 Aug 2016 19:56:00 +0200
-Last-Updated: Sun, 20 May 2018 00:09:00 +0200
-Subject: [PATCH] Change rpath for rustc/rustdoc to rustlib/$TARGET/lib
-
-Rust installs two identical sets of *.so libraries into /usr/lib and
-/usr/lib/rustlib/$TARGET/lib. The former comes with the rustc component,
-/usr/bin/rustc and /usr/bin/rustdoc are linked against them. The latter
-comes with rust-std and are used for binaries dynamically linked against
-Rust libraries (usually compiler plugins, like clippy).
-
-These *.so libraries don't keep stable ABI, so it's better to treat
-them as private. Such libraries should not be exposed at standard paths
-like /usr/lib, but use rpath.
-
-This patch changes rpath for binaries of the rustc component to
-`$ORIGIN/../lib/rustlib/$TARGET/lib`. Duplicate libraries will be still
-installed into /usr/lib, but we can simply remove them when packaging.
-
-Related upstream issues:
-
-* https://github.com/rust-lang/rust/issues/37971
-* https://github.com/rust-lang-nursery/rustup.rs/issues/837
-
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -989,12 +989,12 @@
- // so. Note that this is definitely a hack, and we should likely
- // flesh out rpath support more fully in the future.
- rustflags.arg("-Zosx-rpath-install-name");
-- Some("-Wl,-rpath,@loader_path/../lib")
-+ Some("-Wl,-rpath,@loader_path/../lib".to_string())
- } else if !target.contains("windows") &&
- !target.contains("wasm32") &&
- !target.contains("emscripten") &&
- !target.contains("fuchsia") {
-- Some("-Wl,-rpath,$ORIGIN/../lib")
-+ Some(format!("-Wl,-rpath,$ORIGIN/../lib/rustlib/{}/lib", target))
- } else {
- None
- };