summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorChristian Melki <christian.melki@t2data.com>2022-05-13 16:35:54 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2022-05-18 19:50:24 +0200
commit7584d7aa8a2fdf1c106b1a9ace1afb1970b665f1 (patch)
tree8a6b93fddce288849a3c887ff73d69c5a297a514 /patches
parent222fba2f7ededa3f23a05d7a30b5d35b3850a8f3 (diff)
downloadptxdist-7584d7aa8a2fdf1c106b1a9ace1afb1970b665f1.tar.gz
ptxdist-7584d7aa8a2fdf1c106b1a9ace1afb1970b665f1.tar.xz
host-meson: Version bump. 0.60.3 -> 0.62.1
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. Signed-off-by: Christian Melki <christian.melki@t2data.com> Message-Id: <20220513143554.2334462-1-christian.melki@t2data.com> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/meson-0.62.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (renamed from patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch)6
-rw-r--r--patches/meson-0.62.1/0002-HACK-enable-NEON-only-for-ARMv7.patch (renamed from patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch)2
-rw-r--r--patches/meson-0.62.1/series (renamed from patches/meson-0.60.3/series)2
3 files changed, 5 insertions, 5 deletions
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
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
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
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