aboutsummaryrefslogtreecommitdiffstats
path: root/testing/rust/change-rpath-to-rustlib.patch
diff options
context:
space:
mode:
authorShiz <hi@shiz.me>2017-04-16 15:56:18 +0000
committerJakub Jirutka <jakub@jirutka.cz>2017-04-21 01:44:33 +0200
commit3db351aa5647eb4a482e9e008bedcf1a5be51302 (patch)
treefe64ea58b55936fc2da3f78eaa48c1703ec6bcf6 /testing/rust/change-rpath-to-rustlib.patch
parente4cc4b79b548e043d635ff35c3e9f2e832be1202 (diff)
downloadaports-3db351aa5647eb4a482e9e008bedcf1a5be51302.tar.bz2
aports-3db351aa5647eb4a482e9e008bedcf1a5be51302.tar.xz
testing/rust: reorganize patches
This divides up the patches in three logical categories: - musl-*.patch: musl support patches intended for upstreaming; - alpine-*.patch: Alpine-specific patches that are likely not upstreamable; - *.patch: functionality patch that may make it upstream.
Diffstat (limited to 'testing/rust/change-rpath-to-rustlib.patch')
-rw-r--r--testing/rust/change-rpath-to-rustlib.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/testing/rust/change-rpath-to-rustlib.patch b/testing/rust/change-rpath-to-rustlib.patch
deleted file mode 100644
index 4be0f9d0a6..0000000000
--- a/testing/rust/change-rpath-to-rustlib.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sat, 08 Aug 2016 19:56: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/bin/rustc.rs
-+++ b/src/bootstrap/bin/rustc.rs
-@@ -189,9 +189,9 @@
- if stage != "0" {
- cmd.arg("-Z").arg("osx-rpath-install-name");
- }
-- Some("-Wl,-rpath,@loader_path/../lib")
-+ Some("-Wl,-rpath,@loader_path/../lib".to_string())
- } else if !target.contains("windows") {
-- Some("-Wl,-rpath,$ORIGIN/../lib")
-+ Some(format!("-Wl,-rpath,$ORIGIN/../lib/rustlib/{}/lib", target))
- } else {
- None
- };