summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/meson/meson/disable-rpath-handling.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/disable-rpath-handling.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
deleted file mode 100644
index 7c766c61b0..0000000000
--- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 27bbd3c9d8d86de545fcf6608564a14571c98a61 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 23 Nov 2018 15:28:28 +0000
4Subject: [PATCH] meson: Disable rpath stripping at install time
5
6We need to allow our rpaths generated through the compiler flags to make it into
7our binaries. Therefore disable the meson manipulations of these unless there
8is a specific directive to do something differently in the project.
9
10RP 2018/11/23
11
12Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
13
14---
15 mesonbuild/minstall.py | 7 +++++--
16 1 file changed, 5 insertions(+), 2 deletions(-)
17
18diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
19index 212568a..06366d4 100644
20--- a/mesonbuild/minstall.py
21+++ b/mesonbuild/minstall.py
22@@ -653,8 +653,11 @@ class Installer:
23 if file_copied:
24 self.did_install_something = True
25 try:
26- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
27- install_name_mappings, verbose=False)
28+ if install_rpath:
29+ self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
30+ install_name_mappings, verbose=False)
31+ else:
32+ print("RPATH changes at install time disabled")
33 except SystemExit as e:
34 if isinstance(e.code, int) and e.code == 0:
35 pass