diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-23 15:28:28 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-23 23:35:19 +0000 |
commit | 9f3aa44e1bcb2f565e1c17df5d187c5647f231ba (patch) | |
tree | 7a4c31f9fbb1dd5d5e4536cc9fd16ef80af8821e /meta/recipes-devtools/meson/meson/disable-rpath-handling.patch | |
parent | dfe84d9ca3693037a650ca724ad2f118b1acfef8 (diff) | |
download | poky-9f3aa44e1bcb2f565e1c17df5d187c5647f231ba.tar.gz |
meson: Disable rpath stripping at install time
As discussed in https://github.com/mesonbuild/meson/issues/2567 there
needs to be a way to allow our rpath options passed to the linker to be
preserved, else we run into weird build failures.
(e.g. libmodulemd-native used by libdnf can't find libyaml)
Disable this for now until upstream come up with a better way of handling
this.
(From OE-Core rev: b4e36281631e0b59d1058f5cf391eb8b15e605cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/disable-rpath-handling.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/disable-rpath-handling.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch new file mode 100644 index 0000000000..4b1fb57dd4 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch | |||
@@ -0,0 +1,26 @@ | |||
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 | ||