| Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame^] | 1 | We need to allow our rpaths generated through the compiler flags to make it into |
| 2 | our binaries. Therefore disable the meson manipulations of these unless there |
| 3 | is a specific directive to do something differently in the project. |
| 4 | |
| 5 | RP 2018/11/23 |
| 6 | |
| 7 | Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] |
| 8 | |
| 9 | Index: meson-0.47.2/mesonbuild/minstall.py |
| 10 | =================================================================== |
| 11 | --- meson-0.47.2.orig/mesonbuild/minstall.py |
| 12 | +++ meson-0.47.2/mesonbuild/minstall.py |
| 13 | @@ -486,8 +486,11 @@ class Installer: |
| 14 | printed_symlink_error = True |
| 15 | if os.path.isfile(outname): |
| 16 | try: |
| 17 | - depfixer.fix_rpath(outname, install_rpath, final_path, |
| 18 | - install_name_mappings, verbose=False) |
| 19 | + if install_rpath: |
| 20 | + depfixer.fix_rpath(outname, install_rpath, final_path, |
| 21 | + install_name_mappings, verbose=False) |
| 22 | + else: |
| 23 | + print("RPATH changes at install time disabled") |
| 24 | except SystemExit as e: |
| 25 | if isinstance(e.code, int) and e.code == 0: |
| 26 | pass |