| From 3af10fa8cd4e97181288d72227dea712290fd5e6 Mon Sep 17 00:00:00 2001 |
| From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| Date: Fri, 23 Nov 2018 15:28:28 +0000 |
| Subject: [PATCH] meson: Disable rpath stripping at install time |
| |
| We need to allow our rpaths generated through the compiler flags to make it into |
| our binaries. Therefore disable the meson manipulations of these unless there |
| is a specific directive to do something differently in the project. |
| |
| RP 2018/11/23 |
| |
| Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] |
| |
| --- |
| mesonbuild/minstall.py | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py |
| index ace0569..85bd8df 100644 |
| --- a/mesonbuild/minstall.py |
| +++ b/mesonbuild/minstall.py |
| @@ -508,8 +508,11 @@ class Installer: |
| if file_copied: |
| self.did_install_something = True |
| try: |
| - depfixer.fix_rpath(outname, install_rpath, final_path, |
| - install_name_mappings, verbose=False) |
| + if install_rpath: |
| + depfixer.fix_rpath(outname, install_rpath, final_path, |
| + install_name_mappings, verbose=False) |
| + else: |
| + print("RPATH changes at install time disabled") |
| except SystemExit as e: |
| if isinstance(e.code, int) and e.code == 0: |
| pass |