From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Christian Melki <christian.melki@t2data.com>
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] host-meson: Version bump. 0.60.3 -> 0.62.1
Date: Wed, 25 May 2022 11:44:42 +0200 [thread overview]
Message-ID: <Yo36ijbZPj/fYGiX@pengutronix.de> (raw)
In-Reply-To: <20220513143554.2334462-1-christian.melki@t2data.com>
On Fri, May 13, 2022 at 04:35:54PM +0200, Christian Melki wrote:
> Approx. half a year between the releases.
> Release notes, somewhat summarized:
> https://mesonbuild.com/Release-notes-for-0-61-0.html
> https://mesonbuild.com/Release-notes-for-0-62-0.html
>
> * Forward all patches. Ptxdist specific.
So, I merged this, but then I noticed that this version needs a newer
Python. I'd like to avoid that for now. So I downgraded meson to 0.61.4 for
now. I'll revisit this once packages start to require a newer version.
Michael
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> ...n-t-add-rpaths-for-build-directories-when-cross-co.patch | 6 +++---
> .../0002-HACK-enable-NEON-only-for-ARMv7.patch | 2 +-
> patches/{meson-0.60.3 => meson-0.62.1}/series | 2 +-
> rules/host-meson.make | 4 ++--
> 4 files changed, 7 insertions(+), 7 deletions(-)
> rename patches/{meson-0.60.3 => meson-0.62.1}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (91%)
> rename patches/{meson-0.60.3 => meson-0.62.1}/0002-HACK-enable-NEON-only-for-ARMv7.patch (96%)
> rename patches/{meson-0.60.3 => meson-0.62.1}/series (86%)
>
> diff --git a/patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-0.62.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> similarity index 91%
> rename from patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> rename to patches/meson-0.62.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> index b0319b365..5e034784c 100644
> --- a/patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +++ b/patches/meson-0.62.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
> -index 334fc4f24e13..9545744b9bca 100644
> +index 88b66be290c6..b5add5efa30a 100644
> --- a/mesonbuild/linkers/linkers.py
> +++ b/mesonbuild/linkers/linkers.py
> -@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -645,7 +645,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 334fc4f24e13..9545744b9bca 100644
> rpath_dirs_to_remove = set()
> for p in all_paths:
> rpath_dirs_to_remove.add(p.encode('utf8'))
> -@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -673,7 +676,8 @@ class GnuLikeDynamicLinkerMixin:
> paths = padding
> else:
> paths = paths + ':' + padding
> diff --git a/patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-0.62.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> similarity index 96%
> rename from patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch
> rename to patches/meson-0.62.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> index f6c355728..268a9fc5f 100644
> --- a/patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch
> +++ b/patches/meson-0.62.1/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/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
> -index 3339cea5a03f..da2e740d4cd3 100644
> +index 8715a149b79e..72c0d6b5beb0 100644
> --- a/mesonbuild/modules/unstable_simd.py
> +++ b/mesonbuild/modules/unstable_simd.py
> @@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
> diff --git a/patches/meson-0.60.3/series b/patches/meson-0.62.1/series
> similarity index 86%
> rename from patches/meson-0.60.3/series
> rename to patches/meson-0.62.1/series
> index 7c887e1b3..3c8852cde 100644
> --- a/patches/meson-0.60.3/series
> +++ b/patches/meson-0.62.1/series
> @@ -1,5 +1,5 @@
> # generated by git-ptx-patches
> -#tag:ptxdist --start-number 1
> +#tag:base --start-number 1
> 0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> 0002-HACK-enable-NEON-only-for-ARMv7.patch
> # 0a496d0bc50051baaa87da126e867c5c - git-ptx-patches magic
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index cb9a07a3d..e4facb666 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 := 0.60.3
> -HOST_MESON_MD5 := 03ddd7272d8cbb9f33269cb37a200d24
> +HOST_MESON_VERSION := 0.62.1
> +HOST_MESON_MD5 := 2f5301d0e7fd5544ab0004393ba44cbe
> 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.34.1
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2022-05-25 9:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-13 14:35 Christian Melki
2022-05-25 9:44 ` Michael Olbrich [this message]
2022-05-25 9:45 ` [ptxdist] [APPLIED] " Michael Olbrich
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=Yo36ijbZPj/fYGiX@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--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