1
0
forked from brl/citadel

patch meson to not strip RPATH silently on install

This commit is contained in:
Bruce Leidl 2019-01-16 13:40:49 -05:00
parent bedb900e41
commit 24962c24c6
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,26 @@
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]
Index: meson-0.47.2/mesonbuild/minstall.py
===================================================================
--- meson-0.47.2.orig/mesonbuild/minstall.py
+++ meson-0.47.2/mesonbuild/minstall.py
@@ -486,8 +486,11 @@ class Installer:
printed_symlink_error = True
if os.path.isfile(outname):
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

View File

@ -1,4 +1,10 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/meson:"
SRC_URI += "file://0001-use-exe-wrapper-for-custom-targets.patch "
# disable-rpath-handling:
# https://github.com/mesonbuild/meson/issues/2567
# https://github.com/openembedded/openembedded-core/commit/29b5ef236914b152fd255e134569d4a177656bb0
SRC_URI += "\
file://0001-use-exe-wrapper-for-custom-targets.patch \
file://disable-rpath-handling.patch \
"