[ptxdist] [PATCH 1/2] configure_helper: ignore new Meson 1.10.0 builtin options

[ptxdist] [PATCH 1/2] configure_helper: ignore new Meson 1.10.0 builtin options

[Philipp Zabel]

Ignore new Meson builtin options  "b_thinlto_cache",
"b_thinlto_cache_dir", "cpp_importstd", and "os2_emxomf",
and "python.build_config" (all since 1.10.0).

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 scripts/configure_helper.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index 3f2d50856252..d58918183124 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -105,6 +105,8 @@ meson_blacklist = [
 	"b_pch",
 	"b_pgo",
 	"b_pie",
+	"b_thinlto_cache",
+	"b_thinlto_cache_dir",
 	"b_sanitize",
 	"b_staticpic",
 	"backend_max_links",
@@ -131,6 +133,7 @@ meson_blacklist = [
 	"cpp_args",
 	"cpp_debugstl",
 	"cpp_eh",
+	"cpp_importstd",
 	"cpp_link_args",
 	"cpp_rtti",
 	"cpp_std",
@@ -151,9 +154,11 @@ meson_blacklist = [
 	"localstatedir",
 	"mandir",
 	"optimization",
+	"os2_emxomf",
 	"pkg_config_path",
 	"prefer_static",
 	"python.allow_limited_api",
+	"python.build_config",
 	"python.bytecompile",
 	"python.install_env",
 	"python.platlibdir",
-- 
2.47.3

[ptxdist] [PATCH 2/2] host-meson: version bump 1.10.0 -> 1.10.1

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...don-t-add-rpaths-for-build-directories-when-cross-co.patch | 0
 .../0002-HACK-enable-NEON-only-for-ARMv7.patch                | 0
 .../0003-HACK-don-t-fail-if-lrelease-is-missing.patch         | 0
 .../0004-HACK-don-t-fail-if-uic-is-missing.patch              | 0
 ...HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch | 0
 patches/{meson-1.10.0 => meson-1.10.1}/series                 | 0
 rules/host-meson.make                                         | 4 ++--
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename patches/{meson-1.10.0 => meson-1.10.1}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (100%)
 rename patches/{meson-1.10.0 => meson-1.10.1}/0002-HACK-enable-NEON-only-for-ARMv7.patch (100%)
 rename patches/{meson-1.10.0 => meson-1.10.1}/0003-HACK-don-t-fail-if-lrelease-is-missing.patch (100%)
 rename patches/{meson-1.10.0 => meson-1.10.1}/0004-HACK-don-t-fail-if-uic-is-missing.patch (100%)
 rename patches/{meson-1.10.0 => meson-1.10.1}/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch (100%)
 rename patches/{meson-1.10.0 => meson-1.10.1}/series (100%)

diff --git a/patches/meson-1.10.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.10.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 100%
rename from patches/meson-1.10.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to patches/meson-1.10.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
diff --git a/patches/meson-1.10.0/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.10.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 100%
rename from patches/meson-1.10.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-1.10.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
diff --git a/patches/meson-1.10.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.10.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
similarity index 100%
rename from patches/meson-1.10.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
rename to patches/meson-1.10.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
diff --git a/patches/meson-1.10.0/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.10.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
similarity index 100%
rename from patches/meson-1.10.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
rename to patches/meson-1.10.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
diff --git a/patches/meson-1.10.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch b/patches/meson-1.10.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
similarity index 100%
rename from patches/meson-1.10.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
rename to patches/meson-1.10.1/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch
diff --git a/patches/meson-1.10.0/series b/patches/meson-1.10.1/series
similarity index 100%
rename from patches/meson-1.10.0/series
rename to patches/meson-1.10.1/series
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 8dca6b6d799e..49c5366a3607 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.10.0
-HOST_MESON_MD5		:= fe7736c2b6dc4bae42a564f9a5d85f4b
+HOST_MESON_VERSION	:= 1.10.1
+HOST_MESON_MD5		:= e1c12d275f8aae9fae71dff3d6891746
 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