From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 30 Nov 2023 17:27:15 +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 1r8jsg-00EZ5a-38 for lore@lore.pengutronix.de; Thu, 30 Nov 2023 17:27:15 +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 1r8jsh-000821-Ch; Thu, 30 Nov 2023 17:27:15 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r8jsS-00081k-CQ; Thu, 30 Nov 2023 17:27:00 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Thu, 30 Nov 2023 17:26:59 +0100 Message-Id: <20231130162659.446943-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] host-meson: version bump 1.2.1 -> 1.3.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 https://mesonbuild.com/Release-notes-for-1-3-0.html Signed-off-by: Philipp Zabel --- ...paths-for-build-directories-when-cross-co.patch | 8 ++++---- .../0002-HACK-enable-NEON-only-for-ARMv7.patch | 14 +++++++------- ...03-HACK-don-t-fail-if-lrelease-is-missing.patch | 2 +- patches/{meson-1.2.1 => meson-1.3.0}/series | 0 rules/host-meson.make | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) rename patches/{meson-1.2.1 => meson-1.3.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (86%) rename patches/{meson-1.2.1 => meson-1.3.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (62%) rename patches/{meson-1.2.1 => meson-1.3.0}/0003-HACK-don-t-fail-if-lrelease-is-missing.patch (96%) rename patches/{meson-1.2.1 => meson-1.3.0}/series (100%) diff --git a/patches/meson-1.2.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch similarity index 86% rename from patches/meson-1.2.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch rename to patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch index 8fbe58b0cd5d..6a4772ac571e 100644 --- a/patches/meson-1.2.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch +++ b/patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py -index edd408572be0..409e12a5b0ad 100644 +index dbb5e57aa585..3d321cc24413 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py -@@ -676,7 +676,10 @@ class GnuLikeDynamicLinkerMixin: +@@ -684,7 +684,10 @@ 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 +23,10 @@ index edd408572be0..409e12a5b0ad 100644 + all_paths = mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths]) + else: + all_paths = mesonlib.OrderedSet() - rpath_dirs_to_remove = set() + rpath_dirs_to_remove: T.Set[bytes] = set() for p in all_paths: rpath_dirs_to_remove.add(p.encode('utf8')) -@@ -704,7 +707,8 @@ class GnuLikeDynamicLinkerMixin: +@@ -712,7 +715,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): paths = padding else: paths = paths + ':' + padding diff --git a/patches/meson-1.2.1/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch similarity index 62% rename from patches/meson-1.2.1/0002-HACK-enable-NEON-only-for-ARMv7.patch rename to patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch index 6c206ee62f51..7be876034262 100644 --- a/patches/meson-1.2.1/0002-HACK-enable-NEON-only-for-ARMv7.patch +++ b/patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch @@ -10,16 +10,16 @@ Signed-off-by: Michael Olbrich 1 file changed, 3 insertions(+) diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py -index 3ee0858b3287..25add8aec18e 100644 +index b8baf39ef34a..2ce09b20d2f9 100644 --- a/mesonbuild/modules/simd.py +++ b/mesonbuild/modules/simd.py -@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule): +@@ -94,6 +94,9 @@ class SimdModule(ExtensionModule): continue - iset_fname = kwargs[iset] # Might also be an array or Files. static_library will validate. - args = compiler.get_instruction_set_args(iset) + + compile_args = compiler.get_instruction_set_args(iset) + cpu = state.environment.machines.host.cpu + if iset == 'neon' and not cpu.startswith('armv7'): -+ args = None - if args is None: - mlog.log('Compiler supports %s:' % iset, mlog.red('NO')) ++ compile_args = None + if compile_args is None: + mlog.log(f'Compiler supports {iset}:', mlog.red('NO')) continue diff --git a/patches/meson-1.2.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch similarity index 96% rename from patches/meson-1.2.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch rename to patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch index f2e6418c7c11..28e6b90846c7 100644 --- a/patches/meson-1.2.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch +++ b/patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch @@ -11,7 +11,7 @@ Signed-off-by: Michael Olbrich 1 file changed, 3 insertions(+) diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py -index 85558885343a..5938fbd4d650 100644 +index 83dcf31bdfb3..b3242ceaf167 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -278,6 +278,9 @@ class QtBaseModule(ExtensionModule): diff --git a/patches/meson-1.2.1/series b/patches/meson-1.3.0/series similarity index 100% rename from patches/meson-1.2.1/series rename to patches/meson-1.3.0/series diff --git a/rules/host-meson.make b/rules/host-meson.make index 4d8eb9cea4a7..aec7a539f03b 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.2.1 -HOST_MESON_MD5 := e3cc846536189aacd7d01858a45ca9af +HOST_MESON_VERSION := 1.3.0 +HOST_MESON_MD5 := 35dc15e4f94ca5fd30dbe2d88a672254 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.39.2