diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-02-28 16:36:48 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-02 14:15:33 +0000 |
| commit | 02f2ecabc3007a143f7b9b278820c7981ecee99a (patch) | |
| tree | f114272baef1a7b546d8e5ac6f40ee8849d378b1 /meta/recipes-devtools/meson/meson/disable-rpath-handling.patch | |
| parent | ecabf7386fce5f1af93215b7c3b47291e4d63cb3 (diff) | |
| download | poky-02f2ecabc3007a143f7b9b278820c7981ecee99a.tar.gz | |
meson: update 0.56.2 -> 0.57.1
Replace hacky 0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
with entries in meson.cross.
Rest of the patches are refreshed.
(From OE-Core rev: 85b4aea551ac4a0f47f916957dd9707c81813a2b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch index 4653a72a20..7c766c61b0 100644 --- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001 | 1 | From 27bbd3c9d8d86de545fcf6608564a14571c98a61 Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Fri, 23 Nov 2018 15:28:28 +0000 | 3 | Date: Fri, 23 Nov 2018 15:28:28 +0000 |
| 4 | Subject: [PATCH] meson: Disable rpath stripping at install time | 4 | Subject: [PATCH] meson: Disable rpath stripping at install time |
| @@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] | |||
| 16 | 1 file changed, 5 insertions(+), 2 deletions(-) | 16 | 1 file changed, 5 insertions(+), 2 deletions(-) |
| 17 | 17 | ||
| 18 | diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py | 18 | diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py |
| 19 | index 0be01fe..5406cab 100644 | 19 | index 212568a..06366d4 100644 |
| 20 | --- a/mesonbuild/minstall.py | 20 | --- a/mesonbuild/minstall.py |
| 21 | +++ b/mesonbuild/minstall.py | 21 | +++ b/mesonbuild/minstall.py |
| 22 | @@ -512,8 +512,11 @@ class Installer: | 22 | @@ -653,8 +653,11 @@ class Installer: |
| 23 | if file_copied: | 23 | if file_copied: |
| 24 | self.did_install_something = True | 24 | self.did_install_something = True |
| 25 | try: | 25 | try: |
| 26 | - depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, | 26 | - self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, |
| 27 | - install_name_mappings, verbose=False) | 27 | - install_name_mappings, verbose=False) |
| 28 | + if install_rpath: | 28 | + if install_rpath: |
| 29 | + depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, | 29 | + self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, |
| 30 | + install_name_mappings, verbose=False) | 30 | + install_name_mappings, verbose=False) |
| 31 | + else: | 31 | + else: |
| 32 | + print("RPATH changes at install time disabled") | 32 | + print("RPATH changes at install time disabled") |