blob: 38e50d72f439e33fee0c7001cdb3c238eacb0e85 [file] [log] [blame]
Andrew Geissler4ed12e12020-06-05 18:00:41 -05001From 3af10fa8cd4e97181288d72227dea712290fd5e6 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
Brad Bishopa5c52ff2018-11-23 10:55:50 +13007our 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
Andrew Geissler4ed12e12020-06-05 18:00:41 -050014---
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 ace0569..85bd8df 100644
20--- a/mesonbuild/minstall.py
21+++ b/mesonbuild/minstall.py
22@@ -508,8 +508,11 @@ class Installer:
23 if file_copied:
24 self.did_install_something = True
Brad Bishopa5c52ff2018-11-23 10:55:50 +130025 try:
26- depfixer.fix_rpath(outname, install_rpath, final_path,
27- install_name_mappings, verbose=False)
28+ if install_rpath:
29+ depfixer.fix_rpath(outname, 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