From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] host-meson: version bump 1.1.0 -> 1.2.0
Date: Tue, 1 Aug 2023 09:48:51 +0200 [thread overview]
Message-ID: <20230801074851.1140251-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20230717150034.142028-1-p.zabel@pengutronix.de>
Thanks, applied as 1edbea95bac9b436674cdc1179b2178d20493bfb.
Michael
[sent from post-receive hook]
On Tue, 01 Aug 2023 09:48:51 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://mesonbuild.com/Release-notes-for-1-2-0.html
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230717150034.142028-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 <m.olbrich@pengutronix.de>
> 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)
prev parent reply other threads:[~2023-08-01 7:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 15:00 [ptxdist] [PATCH] " Philipp Zabel
2023-08-01 7:48 ` Michael Olbrich [this message]
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=20230801074851.1140251-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=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