From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH] host-meson: version bump 1.9.1 -> 1.10.0
Date: Fri, 9 Jan 2026 17:05:45 +0100 [thread overview]
Message-ID: <20260109160545.2089858-1-p.zabel@pengutronix.de> (raw)
https://mesonbuild.com/Release-notes-for-1-10-0.html
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
...t-add-rpaths-for-build-directories-when-cross-co.patch | 8 ++++----
.../0002-HACK-enable-NEON-only-for-ARMv7.patch | 2 +-
.../0003-HACK-don-t-fail-if-lrelease-is-missing.patch | 6 +++---
.../0004-HACK-don-t-fail-if-uic-is-missing.patch | 6 +++---
...-dependencies-trust-pkgconfig-when-looking-for-z.patch | 4 ++--
patches/{meson-1.9.1 => meson-1.10.0}/series | 0
rules/host-meson.make | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
rename patches/{meson-1.9.1 => meson-1.10.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (88%)
rename patches/{meson-1.9.1 => meson-1.10.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (95%)
rename patches/{meson-1.9.1 => meson-1.10.0}/0003-HACK-don-t-fail-if-lrelease-is-missing.patch (86%)
rename patches/{meson-1.9.1 => meson-1.10.0}/0004-HACK-don-t-fail-if-uic-is-missing.patch (87%)
rename patches/{meson-1.9.1 => meson-1.10.0}/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch (88%)
rename patches/{meson-1.9.1 => meson-1.10.0}/series (100%)
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 <m.olbrich@pengutronix.de>
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 <m.olbrich@pengutronix.de>
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 <p.zabel@pengutronix.de>
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 <p.zabel@pengutronix.de>
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 <m.olbrich@pengutronix.de>
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)
--
2.47.3
reply other threads:[~2026-01-09 16:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260109160545.2089858-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox