From e655eb232d7328d9dea296fa3e78f6e1d88ea8e7 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Mon, 13 Jul 2020 09:32:01 -0400 Subject: [PATCH] recipe/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch: update to apply to Meson 0.55.0 Note that fix_rpath() has acquired a new argument. Maybe this patch is no longer needed? Unfortunately that would take some time to investigate. I'll just keep on using the patch for now. --- ...-RPATH-if-install_rpath-is-not-empty.patch | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/recipe/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/recipe/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch index a7b66c1..5d98947 100644 --- a/recipe/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +++ b/recipe/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch @@ -1,3 +1,5 @@ +Patch updated from the below for Meson 0.55.0. + From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Sat, 14 Jul 2018 11:18:45 +0200 @@ -11,26 +13,23 @@ Signed-off-by: Peter Seiderer 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe..71615b4 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -478,8 +478,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer: + if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, - install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH -+ # But if install_rpath is empty, it will stripped. -+ # So, preserve it in this case ++ # But if install_rpath is empty, it will be stripped. ++ # So, preserve it in this case. + if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing") except SystemExit as e: if isinstance(e.code, int) and e.code == 0: pass --- -2.20.1 -