From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 17 Jul 2023 17:01:02 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qLPih-000gmS-Mr for lore@lore.pengutronix.de; Mon, 17 Jul 2023 17:01:02 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qLPie-00086R-Hr; Mon, 17 Jul 2023 17:01:00 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qLPiG-00085X-1U; Mon, 17 Jul 2023 17:00:36 +0200 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Mon, 17 Jul 2023 17:00:34 +0200 Message-Id: <20230717150034.142028-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.1.0 -> 1.2.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.ext.pengutronix.de); SAEximRunCond expanded to false https://mesonbuild.com/Release-notes-for-1-2-0.html Signed-off-by: Philipp Zabel --- ...n-t-add-rpaths-for-build-directories-when-cross-co.patch | 6 +++--- .../0002-HACK-enable-NEON-only-for-ARMv7.patch | 0 .../0003-HACK-don-t-fail-if-lrelease-is-missing.patch | 0 patches/{meson-1.1.0 => meson-1.2.0}/series | 0 rules/host-meson.make | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename patches/{meson-1.1.0 => meson-1.2.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (91%) rename patches/{meson-1.1.0 => meson-1.2.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (100%) rename patches/{meson-1.1.0 => meson-1.2.0}/0003-HACK-don-t-fail-if-lrelease-is-missing.patch (100%) rename patches/{meson-1.1.0 => meson-1.2.0}/series (100%) diff --git a/patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.2.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch similarity index 91% rename from patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch rename to patches/meson-1.2.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch index d8e2667df74e..8fbe58b0cd5d 100644 --- a/patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch +++ b/patches/meson-1.2.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 5799caf76ee0..f466f4eae88c 100644 +index edd408572be0..409e12a5b0ad 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py -@@ -673,7 +673,10 @@ class GnuLikeDynamicLinkerMixin: +@@ -676,7 +676,10 @@ class GnuLikeDynamicLinkerMixin: # Need to deduplicate rpaths, as macOS's install_name_tool # is *very* allergic to duplicate -delete_rpath arguments # when calling depfixer on installation. @@ -26,7 +26,7 @@ index 5799caf76ee0..f466f4eae88c 100644 rpath_dirs_to_remove = set() for p in all_paths: rpath_dirs_to_remove.add(p.encode('utf8')) -@@ -701,7 +704,8 @@ class GnuLikeDynamicLinkerMixin: +@@ -704,7 +707,8 @@ class GnuLikeDynamicLinkerMixin: paths = padding else: paths = paths + ':' + padding diff --git a/patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.2.0/0002-HACK-enable-NEON-only-for-ARMv7.patch similarity index 100% rename from patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch rename to patches/meson-1.2.0/0002-HACK-enable-NEON-only-for-ARMv7.patch diff --git a/patches/meson-1.1.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.2.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch similarity index 100% rename from patches/meson-1.1.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch rename to patches/meson-1.2.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch diff --git a/patches/meson-1.1.0/series b/patches/meson-1.2.0/series similarity index 100% rename from patches/meson-1.1.0/series rename to patches/meson-1.2.0/series diff --git a/rules/host-meson.make b/rules/host-meson.make index 8bbe79135e1a..fae56c539187 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.1.0 -HOST_MESON_MD5 := 94ea898bcf799470878e60809be80467 +HOST_MESON_VERSION := 1.2.0 +HOST_MESON_MD5 := 677616183f2c5e03e2139b06280129a0 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