diff options
-rw-r--r-- | meta/recipes-devtools/meson/meson/disable-rpath-handling.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson_1.0.1.bb | 1 |
2 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch deleted file mode 100644 index 7aaed8b4a3..0000000000 --- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 Mon Sep 17 00:00:00 2001 | ||
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 | ||
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 | --- | ||
14 | mesonbuild/minstall.py | 7 +++++-- | ||
15 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py | ||
18 | index 7d0da13..17d50db 100644 | ||
19 | --- a/mesonbuild/minstall.py | ||
20 | +++ b/mesonbuild/minstall.py | ||
21 | @@ -718,8 +718,11 @@ class Installer: | ||
22 | if file_copied: | ||
23 | self.did_install_something = True | ||
24 | try: | ||
25 | - self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, | ||
26 | - install_name_mappings, verbose=False) | ||
27 | + if install_rpath: | ||
28 | + self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, | ||
29 | + install_name_mappings, verbose=False) | ||
30 | + else: | ||
31 | + print("RPATH changes at install time disabled") | ||
32 | except SystemExit as e: | ||
33 | if isinstance(e.code, int) and e.code == 0: | ||
34 | pass | ||
35 | -- | ||
36 | 2.20.1 | ||
37 | |||
diff --git a/meta/recipes-devtools/meson/meson_1.0.1.bb b/meta/recipes-devtools/meson/meson_1.0.1.bb index ce12a3126b..fd478b2161 100644 --- a/meta/recipes-devtools/meson/meson_1.0.1.bb +++ b/meta/recipes-devtools/meson/meson_1.0.1.bb | |||
@@ -12,7 +12,6 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ | |||
12 | file://meson-setup.py \ | 12 | file://meson-setup.py \ |
13 | file://meson-wrapper \ | 13 | file://meson-wrapper \ |
14 | file://0001-python-module-do-not-manipulate-the-environment-when.patch \ | 14 | file://0001-python-module-do-not-manipulate-the-environment-when.patch \ |
15 | file://disable-rpath-handling.patch \ | ||
16 | file://0001-Make-CPU-family-warnings-fatal.patch \ | 15 | file://0001-Make-CPU-family-warnings-fatal.patch \ |
17 | file://0002-Support-building-allarch-recipes-again.patch \ | 16 | file://0002-Support-building-allarch-recipes-again.patch \ |
18 | file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ | 17 | file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ |