host-meson: fix pc file generation with Python 3.5

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

4 files changed, 32 insertions, 4 deletions

diff --git a/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch b/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
new file mode 100644
index 000000000..086ec0d81
--- /dev/null
+++ b/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
@@ -0,0 +1,26 @@
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Mon, 7 Dec 2020 11:40:20 -0500
+Subject: [PATCH] pkgconfig: Respect variable ordering when passed as list
+
+This fix a regression introduced in Meson 0.56.0 when using python 3.5.
+Also mention in documentation that using a meson dict does not guarantee
+ordering.
+
+Fixes: #8074.
+---
+ mesonbuild/interpreter.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
+index 6222f97a71d8..b0cbecc75114 100644
+--- a/mesonbuild/interpreter.py
++++ b/mesonbuild/interpreter.py
+@@ -2690,7 +2690,7 @@ class Interpreter(InterpreterBase):
+             varlist = mesonlib.stringlistify(variables)
+             if list_new:
+                 FeatureNew.single_use('variables as list of strings', '0.56.0', self.subproject)
+-            variables = {}
++            variables = collections.OrderedDict()
+             for v in varlist:
+                 try:
+                     (key, value) = v.split('=', 1)
diff --git a/patches/meson-0.56.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index ccf5bfc2f..ccf5bfc2f 100644
--- a/patches/meson-0.56.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++ b/patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
diff --git a/patches/meson-0.56.0/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch
index f6f0dc448..f6f0dc448 100644
--- a/patches/meson-0.56.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch
diff --git a/patches/meson-0.56.0/series b/patches/meson-0.56.0/series
index 3c8852cde..10eaa5573 100644
--- a/patches/meson-0.56.0/series
+++ b/patches/meson-0.56.0/series
@@ -1,5 +1,7 @@
 # generated by git-ptx-patches
-#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
+#tag:upstream --start-number 1
+0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
+#tag:ptxdist --start-number 100
+0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+0101-HACK-enable-NEON-only-for-ARMv7.patch
+# a15bcb28786933dffabce202768a0e86  - git-ptx-patches magic