Thanks, applied as 3a1c7f33a1e2b253b9aad2c547d063cd5946648c. Michael
[sent from post-receive hook] On Fri, 29 Aug 2025 11:46:26 +0200, Christian Melki <[email protected]> wrote: > Doesn't look scary. > https://mesonbuild.com/Release-notes-for-1-8-0.html > > * Forward patches, slight offset adjustments. Applies cleanly. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > [mol: fix rpath hack] > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > > b/patches/meson-1.8.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > similarity index 76% > rename from > patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > rename to > patches/meson-1.8.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > index 1376f3feb3c9..d7c721ceb6ea 100644 > --- > a/patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > +++ > b/patches/meson-1.8.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > @@ -5,16 +5,18 @@ Subject: [PATCH] don't add rpaths for build directories > when cross-compiling > The binaries cannot be executed anyways, so this just increases the binary > size unnecessarily. > > +Instead add -rpath-link so ensure the libraries are found at build-time. > + > Signed-off-by: Michael Olbrich <[email protected]> > --- > - mesonbuild/linkers/linkers.py | 8 ++++++-- > - 1 file changed, 6 insertions(+), 2 deletions(-) > + mesonbuild/linkers/linkers.py | 10 ++++++++-- > + 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py > -index 176fb3348204..a1f1e0c2d87b 100644 > +index 59f60e03a19c..83a14fc27a08 100644 > --- a/mesonbuild/linkers/linkers.py > +++ b/mesonbuild/linkers/linkers.py > -@@ -698,7 +698,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > +@@ -717,7 +717,12 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > # Need to deduplicate rpaths, as macOS's install_name_tool > # is *very* allergic to duplicate -delete_rpath arguments > # when calling depfixer on installation. > @@ -23,10 +25,12 @@ index 176fb3348204..a1f1e0c2d87b 100644 > + all_paths = > mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in > processed_rpaths]) > + else: > + all_paths = mesonlib.OrderedSet() > ++ for p in rpath_paths: > ++ args.extend(self._apply_prefix('-rpath-link,' + > os.path.join(build_dir, p))) > rpath_dirs_to_remove: T.Set[bytes] = set() > for p in all_paths: > rpath_dirs_to_remove.add(p.encode('utf8')) > -@@ -728,7 +731,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > +@@ -747,7 +752,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > paths = padding > else: > paths = paths + ':' + padding > diff --git a/patches/meson-1.7.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > b/patches/meson-1.8.2/0002-HACK-enable-NEON-only-for-ARMv7.patch > similarity index 100% > rename from patches/meson-1.7.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > rename to patches/meson-1.8.2/0002-HACK-enable-NEON-only-for-ARMv7.patch > diff --git > a/patches/meson-1.7.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > b/patches/meson-1.8.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > similarity index 100% > rename from > patches/meson-1.7.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > rename to > patches/meson-1.8.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > diff --git a/patches/meson-1.7.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > b/patches/meson-1.8.2/0004-HACK-don-t-fail-if-uic-is-missing.patch > similarity index 100% > rename from patches/meson-1.7.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > rename to patches/meson-1.8.2/0004-HACK-don-t-fail-if-uic-is-missing.patch > diff --git > a/patches/meson-1.7.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > > b/patches/meson-1.8.2/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > similarity index 88% > rename from > patches/meson-1.7.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > rename to > patches/meson-1.8.2/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > index 87490efa8f64..23977eff8ba4 100644 > --- > a/patches/meson-1.7.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > +++ > b/patches/meson-1.8.2/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py > -index 94f51ff69b12..29e3e752882f 100644 > +index 8f0f1baae323..fd9ca9be0d3f 100644 > --- a/mesonbuild/dependencies/dev.py > +++ b/mesonbuild/dependencies/dev.py > -@@ -825,7 +825,7 @@ packages['gmock'] = gmock_factory = DependencyFactory( > +@@ -827,7 +827,7 @@ packages['gmock'] = gmock_factory = DependencyFactory( > > packages['zlib'] = zlib_factory = DependencyFactory( > 'zlib', > diff --git a/patches/meson-1.7.0/series b/patches/meson-1.8.2/series > similarity index 100% > rename from patches/meson-1.7.0/series > rename to patches/meson-1.8.2/series > diff --git a/rules/host-meson.make b/rules/host-meson.make > index ca7649b00f2d..2c76d9695cb7 100644 > --- a/rules/host-meson.make > +++ b/rules/host-meson.make > @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson > # > # Paths and names > # > -HOST_MESON_VERSION := 1.7.0 > -HOST_MESON_MD5 := c20f3e5ebbb007352d22f4fd6ceb925c > +HOST_MESON_VERSION := 1.8.2 > +HOST_MESON_MD5 := 677d8dfec2a8c25bcc4de4227403fe0a > HOST_MESON := meson-$(HOST_MESON_VERSION) > HOST_MESON_SUFFIX := tar.gz > HOST_MESON_URL := > https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
