From 4888e9f7ba0bb6ab3aa77729a595ce0c41532d61 Mon Sep 17 00:00:00 2001 From: Monson Shao Date: Tue, 30 Jul 2024 08:06:30 +0000 Subject: [PATCH] drop rpath patch This rpath patch was introduced to fix glib-feedstock/issues/40. As stated in e655eb232, this is no longer needed, it will cause meson to skip fixing some should-be-fix RPATH on macos, making meson behaving differently from other packaging system. If someone does need this, it should be submitted to upstream instead of keeping it as privite patch in conda-forge. --- ...-RPATH-if-install_rpath-is-not-empty.patch | 35 ------------------- recipe/meta.yaml | 5 +-- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 recipe/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch 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 deleted file mode 100644 index 02fcfa5..0000000 --- a/recipe/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +++ /dev/null @@ -1,35 +0,0 @@ -conda-forge patch derived from the original below: - -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Sat, 14 Jul 2018 11:18:45 +0200 -Subject: [PATCH] Only fix RPATH if install_rpath is not empty - -Signed-off-by: Eric Le Bihan -[Fix: remove leftover from original/unconditional code] -Signed-off-by: Peter Seiderer ---- - mesonbuild/minstall.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 7d0da13..31b9935 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -718,8 +718,14 @@ 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) -+ # Buildroot check-host-rpath script expects RPATH -+ # But if install_rpath is empty, it will be stripped. -+ # So, preserve it in this case. -+ if install_rpath: -+ self.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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e32dd25..6ac2d9c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,12 +7,9 @@ package: source: url: https://pypi.io/packages/source/m/meson/meson-{{ version }}.tar.gz sha256: 567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed - # See conda-forge/glib-feedstock#40 for documentation regarding the RPATH patch - patches: - - 0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch build: - number: 0 + number: 1 script: {{ PYTHON }} -m pip install . -vv noarch: python entry_points: