blob: 4653a72a20ec3161dd5f6fd3f1c103f590555c1f [file] [log] [blame]
Andrew Geissler635e0e42020-08-21 15:58:33 -05001From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
Andrew Geissler4ed12e12020-06-05 18:00:41 -05002From: 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
Andrew Geissler635e0e42020-08-21 15:58:33 -050019index 0be01fe..5406cab 100644
Andrew Geissler4ed12e12020-06-05 18:00:41 -050020--- a/mesonbuild/minstall.py
21+++ b/mesonbuild/minstall.py
Andrew Geissler635e0e42020-08-21 15:58:33 -050022@@ -512,8 +512,11 @@ class Installer:
Andrew Geissler4ed12e12020-06-05 18:00:41 -050023 if file_copied:
24 self.did_install_something = True
Brad Bishopa5c52ff2018-11-23 10:55:50 +130025 try:
Andrew Geissler635e0e42020-08-21 15:58:33 -050026- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
Brad Bishopa5c52ff2018-11-23 10:55:50 +130027- install_name_mappings, verbose=False)
28+ if install_rpath:
Andrew Geissler635e0e42020-08-21 15:58:33 -050029+ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
Brad Bishopa5c52ff2018-11-23 10:55:50 +130030+ 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