From: Ross Burton <[email protected]> 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 Signed-off-by: Ross Burton <[email protected]> Signed-off-by: Alexandre Belloni <[email protected]> (cherry picked from commit 4011c0fadec98f1001046079f59e4e2a4a3a3fcf) Signed-off-by: Steve Sakoman <[email protected]> --- .../meson/meson/disable-rpath-handling.patch | 37 ------------------- meta/recipes-devtools/meson/meson_0.63.3.bb | 1 - 2 files changed, 38 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/disable-rpath-handling.patch 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 @@ -From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <[email protected]> -Date: Fri, 23 Nov 2018 15:28:28 +0000 -Subject: [PATCH] meson: Disable rpath stripping at install time - -We need to allow our rpaths generated through the compiler flags to make it into -our binaries. Therefore disable the meson manipulations of these unless there -is a specific directive to do something differently in the project. - -RP 2018/11/23 - -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] ---- - mesonbuild/minstall.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 7d0da13..17d50db 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -718,8 +718,11 @@ class Installer: - if file_copied: - self.did_install_something = True - try: -- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -- install_name_mappings, verbose=False) -+ if install_rpath: -+ self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -+ install_name_mappings, verbose=False) -+ else: -+ print("RPATH changes at install time disabled") - except SystemExit as e: - if isinstance(e.code, int) and e.code == 0: - pass --- -2.20.1 - diff --git a/meta/recipes-devtools/meson/meson_0.63.3.bb b/meta/recipes-devtools/meson/meson_0.63.3.bb index 9267077422..0d13448744 100644 --- a/meta/recipes-devtools/meson/meson_0.63.3.bb +++ b/meta/recipes-devtools/meson/meson_0.63.3.bb @@ -12,7 +12,6 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://meson-setup.py \ file://meson-wrapper \ file://0001-python-module-do-not-manipulate-the-environment-when.patch \ - file://disable-rpath-handling.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ file://0001-is_debianlike-always-return-False.patch \ -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178724): https://lists.openembedded.org/g/openembedded-core/message/178724 Mute This Topic: https://lists.openembedded.org/mt/97660867/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
