host-meson: version bump 0.51.2 -> 0.53.1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 48 insertions, 48 deletions

diff --git a/patches/meson-0.51.2/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-0.51.2/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch
deleted file mode 100644
index f2f531a66..000000000
--- a/patches/meson-0.51.2/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 18 Mar 2019 10:42:15 +0100
-Subject: [PATCH] don't add rpaths for build directories when cross-compiling
-
-The binaries cannot be executed anyways, so this just increases the binary
-size unnecessarily.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- mesonbuild/compilers/compilers.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
-index b188788b915a..aafabd4f7a1b 100644
---- a/mesonbuild/compilers/compilers.py
-+++ b/mesonbuild/compilers/compilers.py
-@@ -1277,7 +1277,10 @@ class Compiler:
-         # Need to deduplicate rpaths, as macOS's install_name_tool
-         # is *very* allergic to duplicate -delete_rpath arguments
-         # when calling depfixer on installation.
--        all_paths = OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths])
-+        if not self.is_cross:
-+            all_paths = OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths])
-+        else:
-+            all_paths = OrderedSet()
-         # Build_rpath is used as-is (it is usually absolute).
-         if build_rpath != '':
-             all_paths.add(build_rpath)
-@@ -1304,7 +1307,8 @@ class Compiler:
-                     paths = padding
-                 else:
-                     paths = paths + ':' + padding
--            args.append('-Wl,-rpath,' + paths)
-+            if paths:
-+                args.append('-Wl,-rpath,' + paths)
- 
-         if mesonlib.is_sunos():
-             return args
diff --git a/patches/meson-0.51.2/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch b/patches/meson-0.53.1/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch
index 5e2b793b3..943bf545d 100644
--- a/patches/meson-0.51.2/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch
+++ b/patches/meson-0.53.1/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mesonbuild/build.py b/mesonbuild/build.py
-index 55b162974bcc..1c09219c87b7 100644
+index 0eb930bea0fb..8e50d67ee133 100644
 --- a/mesonbuild/build.py
 +++ b/mesonbuild/build.py
-@@ -763,7 +763,8 @@ class BuildTarget(Target):
+@@ -792,7 +792,8 @@ class BuildTarget(Target):
      def get_link_dep_subdirs(self):
          result = OrderedSet()
          for i in self.link_targets:
diff --git a/patches/meson-0.53.1/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-0.53.1/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch
new file mode 100644
index 000000000..a040a230e
--- /dev/null
+++ b/patches/meson-0.53.1/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch
@@ -0,0 +1,38 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 18 Mar 2019 10:42:15 +0100
+Subject: [PATCH] don't add rpaths for build directories when cross-compiling
+
+The binaries cannot be executed anyways, so this just increases the binary
+size unnecessarily.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ mesonbuild/linkers.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py
+index 0a5c57e08a02..e905d2cc2617 100644
+--- a/mesonbuild/linkers.py
++++ b/mesonbuild/linkers.py
+@@ -516,7 +516,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.
+-        all_paths = mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths])
++        if not env.is_cross_build():
++            all_paths = mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths])
++        else:
++            all_paths = mesonlib.OrderedSet()
+         # Build_rpath is used as-is (it is usually absolute).
+         if build_rpath != '':
+             all_paths.add(build_rpath)
+@@ -539,7 +542,8 @@ class GnuLikeDynamicLinkerMixin:
+                 paths = padding
+             else:
+                 paths = paths + ':' + padding
+-        args.extend(self._apply_prefix('-rpath,' + paths))
++        if paths:
++            args.extend(self._apply_prefix('-rpath,' + paths))
+ 
+         # TODO: should this actually be "for solaris/sunos"?
+         if mesonlib.is_sunos():
diff --git a/patches/meson-0.51.2/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch b/patches/meson-0.53.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch
index 4b714b2b6..ed84af3b6 100644
--- a/patches/meson-0.51.2/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch
+++ b/patches/meson-0.53.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
-index 085589074d52..30b180c07457 100644
+index 2a07058a62f8..60708cafeacc 100644
 --- a/mesonbuild/backend/backends.py
 +++ b/mesonbuild/backend/backends.py
-@@ -1077,9 +1077,13 @@ class Backend:
+@@ -1088,9 +1088,13 @@ class Backend:
                  # Done separately because of strip/aliases/rpath
                  if outdirs[0] is not False:
                      mappings = t.get_link_deps_mapping(d.prefix, self.environment)
@@ -27,13 +27,13 @@ index 085589074d52..30b180c07457 100644
 -                                          t.install_rpath, install_mode)
 +                                          install_rpath, install_mode)
                      d.targets.append(i)
-                     # On toolchains/platforms that use an import library for
-                     # linking (separate from the shared library with all the
+ 
+                     if isinstance(t, (build.SharedLibrary, build.SharedModule, build.Executable)):
 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index ed82c3791a72..e3d5c96eb215 100644
+index b1a55e5a78f0..541068b49f51 100644
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -486,7 +486,7 @@ class Installer:
+@@ -487,7 +487,7 @@ class Installer:
                          print("Symlink creation does not work on this platform. "
                                "Skipping all symlinking.")
                          printed_symlink_error = True
diff --git a/patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-0.53.1/0004-HACK-enable-NEON-only-for-ARMv7.patch
index a479b4083..f6f0dc448 100644
--- a/patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-0.53.1/0004-HACK-enable-NEON-only-for-ARMv7.patch
@@ -10,12 +10,12 @@ 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 2f2f67f79091..a329a4761d20 100644
+index 4c066fb91339..e4b1824a7087 100644
 --- a/mesonbuild/modules/unstable_simd.py
 +++ b/mesonbuild/modules/unstable_simd.py
 @@ -62,6 +62,9 @@ class SimdModule(ExtensionModule):
                  continue
-             iset_fname = kwargs[iset] # Migth also be an array or Files. static_library will validate.
+             iset_fname = kwargs[iset] # Might also be an array or Files. static_library will validate.
              args = compiler.get_instruction_set_args(iset)
 +            cpu = state.environment.machines.host.cpu
 +            if iset == 'neon' and not cpu.startswith('armv7'):
diff --git a/patches/meson-0.51.2/series b/patches/meson-0.53.1/series
index e6ca14c3f..e6ca14c3f 100644
--- a/patches/meson-0.51.2/series
+++ b/patches/meson-0.53.1/series