From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 23 Jan 2026 16:02:10 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vjIfq-004VvT-28 for lore@lore.pengutronix.de; Fri, 23 Jan 2026 16:02:10 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vjIfq-0000un-14; Fri, 23 Jan 2026 16:02:10 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vjIfW-0000uH-AA; Fri, 23 Jan 2026 16:01:50 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vjIfW-0026x2-2X; Fri, 23 Jan 2026 16:01:50 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vjIfW-00000006T8z-0DOn; Fri, 23 Jan 2026 16:01:50 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 23 Jan 2026 16:01:49 +0100 Message-ID: <20260123150150.1541778-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260109160545.2089858-1-p.zabel@pengutronix.de> References: <20260109160545.2089858-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] host-meson: version bump 1.9.1 -> 1.10.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as d62da034d508a111ba48dd1b21e20853e9f027ad. Michael [sent from post-receive hook] On Fri, 23 Jan 2026 16:01:49 +0100, Philipp Zabel wrote: > https://mesonbuild.com/Release-notes-for-1-10-0.html > > Signed-off-by: Philipp Zabel > Message-Id: <20260109160545.2089858-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/patches/meson-1.9.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.10.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > similarity index 88% > rename from patches/meson-1.9.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > rename to patches/meson-1.10.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > index 4d14af56d6dc..dd5688b684f8 100644 > --- a/patches/meson-1.9.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > +++ b/patches/meson-1.10.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > @@ -13,15 +13,15 @@ Signed-off-by: Michael Olbrich > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py > -index c528db748e7a..1332349dfd5a 100644 > +index d40d5e20effe..35b77143c1cb 100644 > --- a/mesonbuild/linkers/linkers.py > +++ b/mesonbuild/linkers/linkers.py > -@@ -715,7 +715,12 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > +@@ -756,7 +756,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. > - all_paths = mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths]) > -+ if not env.is_cross_build(): > ++ if not self.environment.is_cross_build(): > + all_paths = mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths]) > + else: > + all_paths = mesonlib.OrderedSet() > @@ -30,7 +30,7 @@ index c528db748e7a..1332349dfd5a 100644 > rpath_dirs_to_remove: T.Set[bytes] = set() > for p in all_paths: > rpath_dirs_to_remove.add(p.encode('utf8')) > -@@ -747,7 +752,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > +@@ -788,7 +793,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > paths = padding > else: > paths = paths + ':' + padding > diff --git a/patches/meson-1.9.1/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.10.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > similarity index 95% > rename from patches/meson-1.9.1/0002-HACK-enable-NEON-only-for-ARMv7.patch > rename to patches/meson-1.10.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > index e22d33249acc..eebdaa67f407 100644 > --- a/patches/meson-1.9.1/0002-HACK-enable-NEON-only-for-ARMv7.patch > +++ b/patches/meson-1.10.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > @@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich > 1 file changed, 3 insertions(+) > > diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py > -index bfdc0c2dfc2d..5b9de7a3fd96 100644 > +index 2519d531ef89..3e89fc14d5fc 100644 > --- a/mesonbuild/modules/simd.py > +++ b/mesonbuild/modules/simd.py > @@ -84,6 +84,9 @@ class SimdModule(ExtensionModule): > diff --git a/patches/meson-1.9.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.10.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > similarity index 86% > rename from patches/meson-1.9.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > rename to patches/meson-1.10.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > index 5386dde3f75e..69f3290f8ad9 100644 > --- a/patches/meson-1.9.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > +++ b/patches/meson-1.10.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > @@ -12,12 +12,12 @@ Signed-off-by: Philipp Zabel > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py > -index 7d52842f9dd4..e9b0001a0186 100644 > +index b75169e4b2b0..d28fae605186 100644 > --- a/mesonbuild/modules/_qt.py > +++ b/mesonbuild/modules/_qt.py > -@@ -368,7 +368,7 @@ class QtBaseModule(ExtensionModule): > +@@ -369,7 +369,7 @@ class QtBaseModule(ExtensionModule): > + DEPENDENCY_METHOD_KW, > KwargInfo('required', (bool, options.UserFeatureOption), default=False), > - KwargInfo('method', str, default='auto'), > KwargInfo('tools', ContainerTypeInfo(list, str), listify=True, > - default=['moc', 'uic', 'rcc', 'lrelease'], > + default=['moc', 'uic', 'rcc'], > diff --git a/patches/meson-1.9.1/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.10.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > similarity index 87% > rename from patches/meson-1.9.1/0004-HACK-don-t-fail-if-uic-is-missing.patch > rename to patches/meson-1.10.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > index e7d0cc779b63..38f020b5b87e 100644 > --- a/patches/meson-1.9.1/0004-HACK-don-t-fail-if-uic-is-missing.patch > +++ b/patches/meson-1.10.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > @@ -15,12 +15,12 @@ Signed-off-by: Philipp Zabel > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py > -index e9b0001a0186..eb40463aaf0d 100644 > +index d28fae605186..f167f8b5e534 100644 > --- a/mesonbuild/modules/_qt.py > +++ b/mesonbuild/modules/_qt.py > -@@ -368,7 +368,7 @@ class QtBaseModule(ExtensionModule): > +@@ -369,7 +369,7 @@ class QtBaseModule(ExtensionModule): > + DEPENDENCY_METHOD_KW, > KwargInfo('required', (bool, options.UserFeatureOption), default=False), > - KwargInfo('method', str, default='auto'), > KwargInfo('tools', ContainerTypeInfo(list, str), listify=True, > - default=['moc', 'uic', 'rcc'], > + default=['moc', 'rcc'], > diff --git a/patches/meson-1.9.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch b/patches/meson-1.10.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > similarity index 88% > rename from patches/meson-1.9.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > rename to patches/meson-1.10.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > index 23977eff8ba4..0566e12b3dc0 100644 > --- a/patches/meson-1.9.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > +++ b/patches/meson-1.10.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch > @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py > -index 8f0f1baae323..fd9ca9be0d3f 100644 > +index 4d219a58967f..85f6e2502941 100644 > --- a/mesonbuild/dependencies/dev.py > +++ b/mesonbuild/dependencies/dev.py > -@@ -827,7 +827,7 @@ packages['gmock'] = gmock_factory = DependencyFactory( > +@@ -818,7 +818,7 @@ packages['gmock'] = gmock_factory = DependencyFactory( > > packages['zlib'] = zlib_factory = DependencyFactory( > 'zlib', > diff --git a/patches/meson-1.9.1/series b/patches/meson-1.10.0/series > similarity index 100% > rename from patches/meson-1.9.1/series > rename to patches/meson-1.10.0/series > diff --git a/rules/host-meson.make b/rules/host-meson.make > index 2dc8fd54cdb5..8dca6b6d799e 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.9.1 > -HOST_MESON_MD5 := 19e0a1091cec23d369dd77d852844195 > +HOST_MESON_VERSION := 1.10.0 > +HOST_MESON_MD5 := fe7736c2b6dc4bae42a564f9a5d85f4b > 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)