diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-31 17:52:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-04 13:27:31 +0100 |
commit | 7b2ae9881f189781d30460dcca4432181fd4bce8 (patch) | |
tree | e65cd91f3cb93ec2366e6a30594c71675767cad2 /meta/recipes-devtools/meson/meson/disable-rpath-handling.patch | |
parent | 3ec2330acf6cf84f9030cd3358813170fb3ceff0 (diff) | |
download | poky-7b2ae9881f189781d30460dcca4432181fd4bce8.tar.gz |
meson: upgrade 0.53.2 -> 0.54.2
Drop 0001-mesonbuild-environment.py-check-environment-for-vari.patch
as upstream has refactored the code.
(From OE-Core rev: 1264edce86cafaa64428bb42844437ac4de7df3a)
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 | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch index 4b1fb57dd4..38e50d72f4 100644 --- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch | |||
@@ -1,4 +1,9 @@ | |||
1 | We need to allow our rpaths generated through the compiler flags to make it into | 1 | From 3af10fa8cd4e97181288d72227dea712290fd5e6 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 | ||
2 | our binaries. Therefore disable the meson manipulations of these unless there | 7 | our binaries. Therefore disable the meson manipulations of these unless there |
3 | is a specific directive to do something differently in the project. | 8 | is a specific directive to do something differently in the project. |
4 | 9 | ||
@@ -6,13 +11,17 @@ RP 2018/11/23 | |||
6 | 11 | ||
7 | Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] | 12 | Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] |
8 | 13 | ||
9 | Index: meson-0.47.2/mesonbuild/minstall.py | 14 | --- |
10 | =================================================================== | 15 | mesonbuild/minstall.py | 7 +++++-- |
11 | --- meson-0.47.2.orig/mesonbuild/minstall.py | 16 | 1 file changed, 5 insertions(+), 2 deletions(-) |
12 | +++ meson-0.47.2/mesonbuild/minstall.py | 17 | |
13 | @@ -486,8 +486,11 @@ class Installer: | 18 | diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py |
14 | printed_symlink_error = True | 19 | index ace0569..85bd8df 100644 |
15 | if os.path.isfile(outname): | 20 | --- a/mesonbuild/minstall.py |
21 | +++ b/mesonbuild/minstall.py | ||
22 | @@ -508,8 +508,11 @@ class Installer: | ||
23 | if file_copied: | ||
24 | self.did_install_something = True | ||
16 | try: | 25 | try: |
17 | - depfixer.fix_rpath(outname, install_rpath, final_path, | 26 | - depfixer.fix_rpath(outname, install_rpath, final_path, |
18 | - install_name_mappings, verbose=False) | 27 | - install_name_mappings, verbose=False) |