CVS commit: pkgsrc/devel/meson

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug 14 13:56:41 UTC 2026

Modified Files:
        pkgsrc/devel/meson: distinfo
        pkgsrc/devel/meson/patches: patch-mesonbuild_scripts_depfixer.py

Log Message:
meson: remove rpaths on Darwin - fixes shared libraries in pkgsrc


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.82 pkgsrc/devel/meson/distinfo:1.83
--- pkgsrc/devel/meson/distinfo:1.82    Tue Aug 11 11:43:05 2026
+++ pkgsrc/devel/meson/distinfo Fri Aug 14 13:56:40 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82 2026/08/11 11:43:05 wiz Exp $
+$NetBSD: distinfo,v 1.83 2026/08/14 13:56:40 adam Exp $
 
 BLAKE2s (meson-1.12.0.tar.gz) = 8672cd3848ffbd31da2add5c25ee2dd4ca9e2ee9fce7ecf4edbc53ef6ceb0a76
 SHA512 (meson-1.12.0.tar.gz) = 544ded6f311f22f2a499d82903a45f7dc81f1e86b7bfa0a2effe12b5cbcc8cf8f707d566dd47f4f151cab5ceff84822a4cd16cf1ea55dc9a05667f0ea9094f11
@@ -8,4 +8,4 @@ SHA1 (patch-mesonbuild_compilers_mixins_
 SHA1 (patch-mesonbuild_dependencies_dev.py) = 9ee6c7d85dce4d425a0858b5a444aac79e8c10b5
 SHA1 (patch-mesonbuild_linkers_linkers.py) = 904fb94872e92870c9bdc5641533d9310761775a
 SHA1 (patch-mesonbuild_modules_pkgconfig.py) = df5c55ed97c78e397be07a234e99d2707ff10808
-SHA1 (patch-mesonbuild_scripts_depfixer.py) = 1a374a0d636a187ae09d709566eeeacec4264547
+SHA1 (patch-mesonbuild_scripts_depfixer.py) = 8cf9333ad92ebd123a3ce258e4f4b76fb1ccb8f9

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.5 pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.6
--- pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.5 Tue Aug 11 11:43:05 2026
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py     Fri Aug 14 13:56:41 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-mesonbuild_scripts_depfixer.py,v 1.5 2026/08/11 11:43:05 wiz Exp $
+$NetBSD: patch-mesonbuild_scripts_depfixer.py,v 1.6 2026/08/14 13:56:41 adam Exp $
 
-Do not remove rpaths for ELF.
+Do not remove rpaths for ELF, except for Darwin.
 
---- mesonbuild/scripts/depfixer.py.orig        2026-08-11 11:28:11.685123152 +0000
+--- mesonbuild/scripts/depfixer.py.orig        2026-08-10 20:56:48.000000000 +0000
 +++ mesonbuild/scripts/depfixer.py
-@@ -824,8 +824,6 @@ def fix_rpath(fname: str, rpath_dirs_to_remove: T.Set[
+@@ -824,7 +824,7 @@ def fix_rpath(fname: str, rpath_dirs_to_
              return
          if system == 'aix':
              fix_aix(fname, rpath_dirs_to_remove, new_rpath, verbose)
 -        else:
--            fix_elf(fname, rpath_dirs_to_remove, new_rpath, verbose)
++        elif system == 'darwin':
+             fix_elf(fname, rpath_dirs_to_remove, new_rpath, verbose)
          return
      except SystemExit as e:
-         if isinstance(e.code, int) and e.code == 0: