summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-03-08 21:46:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-11 00:08:40 +0000
commit1bc0d0c80012a8c31c052b330c973366b6730985 (patch)
tree29f02542b390103b2b2a224be646a7991f20c355 /meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
parent6f38e4c98f64a3ea0a61d713aa20b15e5ced9e58 (diff)
downloadpoky-1bc0d0c80012a8c31c052b330c973366b6730985.tar.gz
meson: remove obsolete RPATH stripping patch
As per the release notes for 0.55.0[1], this patch is no longer needed as Meson now only removes the RPATHs that it adds itself, any RPATHs added via LDFLAGS or pkgconfig files are left untouched. [1] https://mesonbuild.com/Release-notes-for-0-55-0.html#rpath-removal-now-more-careful (From OE-Core rev: 4011c0fadec98f1001046079f59e4e2a4a3a3fcf) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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.patch37
1 files changed, 0 insertions, 37 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 @@
1From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 23 Nov 2018 15:28:28 +0000
4Subject: [PATCH] meson: Disable rpath stripping at install time
5
6We need to allow our rpaths generated through the compiler flags to make it into
7our binaries. Therefore disable the meson manipulations of these unless there
8is a specific directive to do something differently in the project.
9
10RP 2018/11/23
11
12Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
13---
14 mesonbuild/minstall.py | 7 +++++--
15 1 file changed, 5 insertions(+), 2 deletions(-)
16
17diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
18index 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--
362.20.1
37