Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 1 | From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Fri, 23 Nov 2018 15:28:28 +0000 |
| 4 | Subject: [PATCH] meson: Disable rpath stripping at install time |
| 5 | |
| 6 | We need to allow our rpaths generated through the compiler flags to make it into |
Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame] | 7 | our binaries. Therefore disable the meson manipulations of these unless there |
| 8 | is a specific directive to do something differently in the project. |
| 9 | |
| 10 | RP 2018/11/23 |
| 11 | |
| 12 | Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] |
| 13 | |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 14 | --- |
| 15 | mesonbuild/minstall.py | 7 +++++-- |
| 16 | 1 file changed, 5 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 19 | index 0be01fe..5406cab 100644 |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 20 | --- a/mesonbuild/minstall.py |
| 21 | +++ b/mesonbuild/minstall.py |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 22 | @@ -512,8 +512,11 @@ class Installer: |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 23 | if file_copied: |
| 24 | self.did_install_something = True |
Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame] | 25 | try: |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 26 | - depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, |
Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame] | 27 | - install_name_mappings, verbose=False) |
| 28 | + if install_rpath: |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 29 | + depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, |
Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame] | 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 |