From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH v2] host-meson: version bump 1.0.0 -> 1.1.0
Date: Wed, 12 Apr 2023 10:29:53 +0200 [thread overview]
Message-ID: <20230412082953.3821173-1-p.zabel@pengutronix.de> (raw)
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
v2: remember the patches
---
...n-t-add-rpaths-for-build-directories-when-cross-co.patch | 6 +++---
.../0002-HACK-enable-NEON-only-for-ARMv7.patch | 4 ++--
patches/{meson-1.0.0 => meson-1.1.0}/series | 0
rules/host-meson.make | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
rename patches/{meson-1.0.0 => meson-1.1.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (91%)
rename patches/{meson-1.0.0 => meson-1.1.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (91%)
rename patches/{meson-1.0.0 => meson-1.1.0}/series (100%)
diff --git a/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 91%
rename from patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to patches/meson-1.1.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index efed46c1df60..d8e2667df74e 100644
--- a/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++ b/patches/meson-1.1.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 3385dd3dcadd..7c15a212802e 100644
+index 5799caf76ee0..f466f4eae88c 100644
--- a/mesonbuild/linkers/linkers.py
+++ b/mesonbuild/linkers/linkers.py
-@@ -660,7 +660,10 @@ class GnuLikeDynamicLinkerMixin:
+@@ -673,7 +673,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 3385dd3dcadd..7c15a212802e 100644
rpath_dirs_to_remove = set()
for p in all_paths:
rpath_dirs_to_remove.add(p.encode('utf8'))
-@@ -688,7 +691,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -701,7 +704,8 @@ class GnuLikeDynamicLinkerMixin:
paths = padding
else:
paths = paths + ':' + padding
diff --git a/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 91%
rename from patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
index 263e1a76b552..6c206ee62f51 100644
--- a/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-1.1.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 3 insertions(+)
diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
-index a33022d0435b..d40be3443776 100644
+index 3ee0858b3287..25add8aec18e 100644
--- a/mesonbuild/modules/simd.py
+++ b/mesonbuild/modules/simd.py
-@@ -63,6 +63,9 @@ class SimdModule(ExtensionModule):
+@@ -64,6 +64,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)
diff --git a/patches/meson-1.0.0/series b/patches/meson-1.1.0/series
similarity index 100%
rename from patches/meson-1.0.0/series
rename to patches/meson-1.1.0/series
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 08b62748d8e0..e86b89e14b39 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.0.0
-HOST_MESON_MD5 := 009b78125467cd9ee4d467175a5c12e1
+HOST_MESON_VERSION := 1.1.0
+HOST_MESON_MD5 := 94ea898bcf799470878e60809be80467
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
next reply other threads:[~2023-04-12 8:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 8:29 Philipp Zabel [this message]
2023-04-14 10:03 ` [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=20230412082953.3821173-1-p.zabel@pengutronix.de \
--to=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