1From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 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 mesonbuild/minstall.py | 7 +++++-- 15 1 file changed, 5 insertions(+), 2 deletions(-) 16 17diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py 18index 7d0da13..17d50db 100644 19--- a/mesonbuild/minstall.py 20+++ b/mesonbuild/minstall.py 21@@ -718,8 +718,11 @@ class Installer: 22 if file_copied: 23 self.did_install_something = True 24 try: 25- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, 26- install_name_mappings, verbose=False) 27+ if install_rpath: 28+ self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, 29+ install_name_mappings, verbose=False) 30+ else: 31+ print("RPATH changes at install time disabled") 32 except SystemExit as e: 33 if isinstance(e.code, int) and e.code == 0: 34 pass 35-- 362.20.1 37 38