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.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
index 38e50d72f4..4653a72a20 100644
--- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
+++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
@@ -1,4 +1,4 @@
1From 3af10fa8cd4e97181288d72227dea712290fd5e6 Mon Sep 17 00:00:00 2001 1From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 23 Nov 2018 15:28:28 +0000 3Date: Fri, 23 Nov 2018 15:28:28 +0000
4Subject: [PATCH] meson: Disable rpath stripping at install time 4Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
16 1 file changed, 5 insertions(+), 2 deletions(-) 16 1 file changed, 5 insertions(+), 2 deletions(-)
17 17
18diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py 18diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
19index ace0569..85bd8df 100644 19index 0be01fe..5406cab 100644
20--- a/mesonbuild/minstall.py 20--- a/mesonbuild/minstall.py
21+++ b/mesonbuild/minstall.py 21+++ b/mesonbuild/minstall.py
22@@ -508,8 +508,11 @@ class Installer: 22@@ -512,8 +512,11 @@ class Installer:
23 if file_copied: 23 if file_copied:
24 self.did_install_something = True 24 self.did_install_something = True
25 try: 25 try:
26- depfixer.fix_rpath(outname, install_rpath, final_path, 26- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
27- install_name_mappings, verbose=False) 27- install_name_mappings, verbose=False)
28+ if install_rpath: 28+ if install_rpath:
29+ depfixer.fix_rpath(outname, install_rpath, final_path, 29+ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
30+ install_name_mappings, verbose=False) 30+ install_name_mappings, verbose=False)
31+ else: 31+ else:
32+ print("RPATH changes at install time disabled") 32+ print("RPATH changes at install time disabled")