tools/meson: update to 1.9.1

Changelog: https://mesonbuild.com/Release-notes-for-1-7-0.html
Changelog: https://mesonbuild.com/Release-notes-for-1-8-0.html
Changelog: https://mesonbuild.com/Release-notes-for-1-9-0.html

Updated patches with the versions from

mesonbuild/meson#15106
mesonbuild/meson#15110

Signed-off-by: Pascal Ernster <git@hardfalcon.net>

Author: hardfalcon

tools/meson/Makefile

@@ -1,11 +1,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=meson
-PKG_VERSION:=1.6.1
+PKG_VERSION:=1.9.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION)
-PKG_HASH:=1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de
+PKG_HASH:=4e076606f2afff7881d195574bddcd8d89286f35a17b4977a216f535dc0c74ac
 
 PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
 PKG_LICENSE:=Apache-2.0

tools/meson/patches/101-01-interpreter-move-can_run_host_binaries-to-environmen.patch

@@ -15,10 +15,10 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -999,3 +999,10 @@ class Environment:
- 
-     def has_exe_wrapper(self) -> bool:
-         return self.exe_wrapper and self.exe_wrapper.found()
+@@ -1120,3 +1120,10 @@ class Environment:
+             # This is how autotools works, and the env vars feature is for
+             # autotools compatibility.
+             largs.extend_value(comp_options)
 +
 +    def can_run_host_binaries(self) -> bool:
 +        return not (
@@ -28,16 +28,17 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +        )
 --- a/mesonbuild/interpreter/mesonmain.py
 +++ b/mesonbuild/interpreter/mesonmain.py
-@@ -277,20 +277,13 @@ class MesonMain(MesonInterpreterObject):
-     @noKwargs
+@@ -258,21 +258,14 @@ class MesonMain(MesonInterpreterObject):
      @FeatureDeprecated('meson.has_exe_wrapper', '0.55.0', 'use meson.can_run_host_binaries instead.')
+     @InterpreterObject.method('has_exe_wrapper')
      def has_exe_wrapper_method(self, args: T.List['TYPE_var'], kwargs: 'TYPE_kwargs') -> bool:
 -        return self._can_run_host_binaries_impl()
 +        return self.build.environment.can_run_host_binaries()
 
      @noPosargs
      @noKwargs
      @FeatureNew('meson.can_run_host_binaries', '0.55.0')
+     @InterpreterObject.method('can_run_host_binaries')
      def can_run_host_binaries_method(self, args: T.List['TYPE_var'], kwargs: 'TYPE_kwargs') -> bool:
 -        return self._can_run_host_binaries_impl()
 -

tools/meson/patches/101-02-linkers-don-t-include-absolue-RPATH-on-cross-compili.patch

@@ -1,4 +1,4 @@
-From 6d3899390bf75985eb79a106f6a487b335509114 Mon Sep 17 00:00:00 2001
+From 432a43ac75e3b124fde2476458a199ceba12582f Mon Sep 17 00:00:00 2001
 From: Christian Marangi <ansuelsmth@gmail.com>
 Date: Sun, 12 Oct 2025 13:57:15 +0200
 Subject: [PATCH] linkers: don't include absolue RPATH on cross-compiling
@@ -17,24 +17,26 @@ packed in the final system (for example a squashfs image)
 
 On top of this on cross-compilation on 99% of the scenario, it's not
 really possible to run the just built tool for build usage as it
-probably target a different arch.
+probably target a different arch (unless the project provide an
+exe_wrapper).
 
 To permit building REAL reproducible binary, add extra logic to skip the
 inclusion of such library path in RPATH if we detect a cross-compilation
 scenario and limit the inclusion of library path in RPATH only to
 relative path (expected to be the ones specific to the building
-binary/internal shared library)
+binary/internal shared library) if we detect the binaries can't be run
+on the host system (by the use of can_run_host_binaries() API).
 
 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 ---
- mesonbuild/linkers/linkers.py | 57 ++++++++++++++++++++++++-----------
- 1 file changed, 40 insertions(+), 17 deletions(-)
+ mesonbuild/linkers/linkers.py | 62 +++++++++++++++++++++++++----------
+ 1 file changed, 45 insertions(+), 17 deletions(-)
 
 --- a/mesonbuild/linkers/linkers.py
 +++ b/mesonbuild/linkers/linkers.py
-@@ -523,11 +523,11 @@ class MetrowerksStaticLinkerARM(Metrower
- class MetrowerksStaticLinkerEmbeddedPowerPC(MetrowerksStaticLinker):
-     id = 'mwldeppc'
+@@ -558,11 +558,11 @@ class TaskingStaticLinker(StaticLinker):
+     def get_linker_always_args(self) -> T.List[str]:
+         return ['-r']
 
 -def prepare_rpaths(raw_rpaths: T.Tuple[str, ...], build_dir: str, from_dir: str) -> T.List[str]:
 +def prepare_rpaths(env: Environment, raw_rpaths: T.Tuple[str, ...], build_dir: str, from_dir: str) -> T.List[str]:
@@ -46,7 +48,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
      ordered_rpaths = order_rpaths(internal_format_rpaths)
      return ordered_rpaths
 
-@@ -544,11 +544,16 @@ def order_rpaths(rpath_list: T.List[str]
+@@ -579,11 +579,16 @@ def order_rpaths(rpath_list: T.List[str]
      return sorted(rpath_list, key=os.path.isabs)
 
 
@@ -65,7 +67,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
      else:
          return os.path.relpath(os.path.join(build_dir, p), os.path.join(build_dir, from_dir))
 
-@@ -673,7 +678,7 @@ class GnuLikeDynamicLinkerMixin(DynamicL
+@@ -711,7 +716,7 @@ class GnuLikeDynamicLinkerMixin(DynamicL
              return ([], set())
          args: T.List[str] = []
          origin_placeholder = '$ORIGIN'
@@ -74,94 +76,94 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
          # Need to deduplicate rpaths, as macOS's install_name_tool
          # is *very* allergic to duplicate -delete_rpath arguments
          # when calling depfixer on installation.
-@@ -683,9 +688,13 @@ class GnuLikeDynamicLinkerMixin(DynamicL
+@@ -721,9 +726,13 @@ class GnuLikeDynamicLinkerMixin(DynamicL
              rpath_dirs_to_remove.add(p.encode('utf8'))
          # Build_rpath is used as-is (it is usually absolute).
-         if build_rpath != '':
--            all_paths.add(build_rpath)
--            for p in build_rpath.split(':'):
+         if target.build_rpath != '':
+-            all_paths.add(target.build_rpath)
+-            for p in target.build_rpath.split(':'):
 -                rpath_dirs_to_remove.add(p.encode('utf8'))
-+            paths = build_rpath.split(':')
++            paths = target.build_rpath.split(':')
 +            for p in paths:
 +                # Only include relative paths if we can't run binaries on host system.
 +                # (cross-compilation and no exe_wrapper)
 +                if env.can_run_host_binaries() or not os.path.isabs(p):
 +                    all_paths.add(p)
 +                    rpath_dirs_to_remove.add(p.encode('utf8'))
+         if extra_paths:
+             all_paths.update(extra_paths)
 
-         # TODO: should this actually be "for (dragonfly|open)bsd"?
-         if mesonlib.is_dragonflybsd() or mesonlib.is_openbsd():
-@@ -828,10 +837,15 @@ class AppleDynamicLinker(PosixDynamicLin
+@@ -883,10 +892,15 @@ class AppleDynamicLinker(PosixDynamicLin
          # @loader_path is the equivalent of $ORIGIN on macOS
          # https://stackoverflow.com/q/26280738
          origin_placeholder = '@loader_path'
 -        processed_rpaths = prepare_rpaths(rpath_paths, build_dir, from_dir)
 +        processed_rpaths = prepare_rpaths(env, rpath_paths, build_dir, from_dir)
          all_paths = mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths])
-         if build_rpath != '':
--            all_paths.update(build_rpath.split(':'))
-+            paths = build_rpath.split(':')
+         if target.build_rpath != '':
+-            all_paths.update(target.build_rpath.split(':'))
++            paths = target.build_rpath.split(':')
 +            for p in paths:
 +                # Only include relative paths if we can't run binaries on host system.
 +                # (cross-compilation and no exe_wrapper)
 +                if env.can_run_host_binaries() or not os.path.isabs(p):
 +                    all_paths.add(p)
+         if extra_paths:
+             all_paths.update(extra_paths)
          for rp in all_paths:
-             rpath_dirs_to_remove.add(rp.encode('utf8'))
-             args.extend(self._apply_prefix('-rpath,' + rp))
-@@ -1200,10 +1214,15 @@ class NAGDynamicLinker(PosixDynamicLinke
+@@ -1261,10 +1275,15 @@ class NAGDynamicLinker(PosixDynamicLinke
              return ([], set())
          args: T.List[str] = []
          origin_placeholder = '$ORIGIN'
 -        processed_rpaths = prepare_rpaths(rpath_paths, build_dir, from_dir)
 +        processed_rpaths = prepare_rpaths(env, rpath_paths, build_dir, from_dir)
          all_paths = mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths])
-         if build_rpath != '':
--            all_paths.add(build_rpath)
-+            paths = build_rpath.split(':')
+         if target.build_rpath != '':
+-            all_paths.add(target.build_rpath)
++            paths = target.build_rpath.split(':')
 +            for p in paths:
 +                # Only include relative paths if we can't run binaries on host system.
 +                # (cross-compilation and no exe_wrapper)
 +                if env.can_run_host_binaries() or not os.path.isabs(p):
 +                    all_paths.add(p)
+         if extra_paths:
+             all_paths.update(extra_paths)
          for rp in all_paths:
-             args.extend(self._apply_prefix('-Wl,-Wl,,-rpath,,' + rp))
- 
-@@ -1454,15 +1473,19 @@ class SolarisDynamicLinker(PosixDynamicL
-                          install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]:
-         if not rpath_paths and not install_rpath and not build_rpath:
+@@ -1517,15 +1536,19 @@ class SolarisDynamicLinker(PosixDynamicL
+         rpath_paths = target.determine_rpath_dirs()
+         if not rpath_paths and not target.install_rpath and not target.build_rpath and not extra_paths:
              return ([], set())
 -        processed_rpaths = prepare_rpaths(rpath_paths, build_dir, from_dir)
 +        processed_rpaths = prepare_rpaths(env, rpath_paths, build_dir, from_dir)
          all_paths = mesonlib.OrderedSet([os.path.join('$ORIGIN', p) for p in processed_rpaths])
          rpath_dirs_to_remove: T.Set[bytes] = set()
          for p in all_paths:
              rpath_dirs_to_remove.add(p.encode('utf8'))
-         if build_rpath != '':
--            all_paths.add(build_rpath)
--            for p in build_rpath.split(':'):
+         if target.build_rpath != '':
+-            all_paths.add(target.build_rpath)
+-            for p in target.build_rpath.split(':'):
 -                rpath_dirs_to_remove.add(p.encode('utf8'))
-+            paths = build_rpath.split(':')
++            paths = target.build_rpath.split(':')
 +            for p in paths:
 +                # Only include relative paths if we can't run binaries on host system.
 +                # (cross-compilation and no exe_wrapper)
 +                if env.can_run_host_binaries() or not os.path.isabs(p):
 +                    all_paths.add(p)
 +                    rpath_dirs_to_remove.add(p.encode('utf8'))
+         if extra_paths:
+             all_paths.update(extra_paths)
 
-         # In order to avoid relinking for RPATH removal, the binary needs to contain just
-         # enough space in the ELF header to hold the final installation RPATH.
-@@ -1525,7 +1548,12 @@ class AIXDynamicLinker(PosixDynamicLinke
-         if install_rpath != '':
-             all_paths.add(install_rpath)
-         if build_rpath != '':
--            all_paths.add(build_rpath)
-+            paths = build_rpath.split(':')
+@@ -1591,7 +1614,12 @@ class AIXDynamicLinker(PosixDynamicLinke
+         if target.install_rpath != '':
+             all_paths.add(target.install_rpath)
+         if target.build_rpath != '':
+-            all_paths.add(target.build_rpath)
++            paths = target.build_rpath.split(':')
 +            for p in paths:
 +                # Only include relative paths if we can't run binaries on host system.
 +                # (cross-compilation and no exe_wrapper)
 +                if env.can_run_host_binaries() or not os.path.isabs(p):
 +                    all_paths.add(p)
-         for p in rpath_paths:
+         for p in target.determine_rpath_dirs():
              all_paths.add(os.path.join(build_dir, p))
          # We should consider allowing the $LIBPATH environment variable