CVS commit: pkgsrc/devel/meson

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 21 09:23:45 UTC 2025

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

Log Message:
meson: always use absolute paths in -rpath

This was made conditional on old linkers in 1.7.2, and broke the build
of gimp-devel.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.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/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.76 pkgsrc/devel/meson/Makefile:1.77
--- pkgsrc/devel/meson/Makefile:1.76    Sat Apr 12 10:40:26 2025
+++ pkgsrc/devel/meson/Makefile Mon Apr 21 09:23:45 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2025/04/12 10:40:26 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2025/04/21 09:23:45 wiz Exp $
 
 DISTNAME=      meson-1.7.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 #MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mesonbuild/}

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.65 pkgsrc/devel/meson/distinfo:1.66
--- pkgsrc/devel/meson/distinfo:1.65    Sat Apr 12 07:02:36 2025
+++ pkgsrc/devel/meson/distinfo Mon Apr 21 09:23:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2025/04/12 07:02:36 wiz Exp $
+$NetBSD: distinfo,v 1.66 2025/04/21 09:23:45 wiz Exp $
 
 BLAKE2s (meson-1.7.2.tar.gz) = 78f41f30e60e45e8f31f2ff8712e725a96606d890d0d68459fcea304860cd7a5
 SHA512 (meson-1.7.2.tar.gz) = 91ddf5421f2808f9f011c2d7f5f2cf9767cf26128821251bae454fc9f36b986ec19d7713b0a938abaaa6300b7f9f06491a91da42080e3811f5271076669da400
@@ -6,6 +6,6 @@ Size (meson-1.7.2.tar.gz) = 4857152 byte
 SHA1 (patch-mesonbuild_compilers_detect.py) = e0d29a213c558a3f753366233c1db627f1637ed1
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f
 SHA1 (patch-mesonbuild_dependencies_dev.py) = 2165f1ee4ad5d9689eb2fb7e94841503336070b9
-SHA1 (patch-mesonbuild_linkers_linkers.py) = 4ca793f71aac2119f94464bb2beb83ed3da3e9a0
+SHA1 (patch-mesonbuild_linkers_linkers.py) = 2f0880543dbd51604e5ec152478d05517221657b
 SHA1 (patch-mesonbuild_modules_pkgconfig.py) = b0c1adc0c4f30d06a8e9854fd0e93ebde126e8ff
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 0abd3326f7872e4d53006ff3de5716007c8f22b7

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py:1.1 pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py:1.2
--- pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py:1.1  Tue Feb 22 17:56:53 2022
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_linkers_linkers.py      Mon Apr 21 09:23:45 2025
@@ -1,10 +1,11 @@
-$NetBSD: patch-mesonbuild_linkers_linkers.py,v 1.1 2022/02/22 17:56:53 jperkin Exp $
+$NetBSD: patch-mesonbuild_linkers_linkers.py,v 1.2 2025/04/21 09:23:45 wiz Exp $
 
-Avoid thin archives on SunOS.
+1. Avoid thin archives on SunOS.
+2. Always use absolute rpaths (per pkgsrc policy)
 
---- mesonbuild/linkers/linkers.py.orig 2022-01-02 20:12:32.000000000 +0000
+--- mesonbuild/linkers/linkers.py.orig 2025-04-03 17:13:56.000000000 +0000
 +++ mesonbuild/linkers/linkers.py
-@@ -197,7 +197,7 @@ class ArLinker(ArLikeLinker):
+@@ -372,7 +372,7 @@ class ArLinker(ArLikeLinker, StaticLinke
          thinargs = ''
          if '[D]' in stdo:
              stdargs += 'D'
@@ -13,3 +14,12 @@ Avoid thin archives on SunOS.
              thinargs = 'T'
          self.std_args = [stdargs]
          self.std_thin_args = [stdargs + thinargs]
+@@ -756,7 +756,7 @@ class GnuLikeDynamicLinkerMixin(DynamicL
+         # ...instead of just one single looooong option, like this:
+         #
+         #   -Wl,-rpath-link,/path/to/folder1:/path/to/folder2:...
+-        if self.id in {'ld.bfd', 'ld.gold'} and mesonlib.version_compare(self.version, '<2.28'):
++        if self.id in {'ld.bfd', 'ld.gold'} and mesonlib.version_compare(self.version, '<2.28') or True:
+             for p in rpath_paths:
+                 args.extend(self._apply_prefix('-rpath-link,' + os.path.join(build_dir, p)))
+