blob: 7c766c61b0323401c0d9c237e57950b5807d6611 [file] [log] [blame]
Andrew Geissler90fd73c2021-03-05 15:25:55 -06001From 27bbd3c9d8d86de545fcf6608564a14571c98a61 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 Geissler90fd73c2021-03-05 15:25:55 -060019index 212568a..06366d4 100644
Andrew Geissler4ed12e12020-06-05 18:00:41 -050020--- a/mesonbuild/minstall.py
21+++ b/mesonbuild/minstall.py
Andrew Geissler90fd73c2021-03-05 15:25:55 -060022@@ -653,8 +653,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 Geissler90fd73c2021-03-05 15:25:55 -060026- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
27- install_name_mappings, verbose=False)
Brad Bishopa5c52ff2018-11-23 10:55:50 +130028+ if install_rpath:
Andrew Geissler90fd73c2021-03-05 15:25:55 -060029+ self.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