Thanks, applied as 8329bce800852c6c0a705d66d1c87f895386cb11. Michael
[sent from post-receive hook] On Sun, 30 Jan 2022 16:49:32 +0100, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > [mol: migrate patches] > Signed-off-by: Michael Olbrich <[email protected]> > > 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 > deleted file mode 100644 > index 086ec0d8126b..000000000000 > --- > a/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From: Xavier Claessens <[email protected]> > -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/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch > > b/patches/meson-0.60.2/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch > similarity index 79% > rename from > patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch > rename to > patches/meson-0.60.2/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch > index ccf5bfc2ff09..b0319b36566b 100644 > --- > a/patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch > +++ > b/patches/meson-0.60.2/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch > @@ -7,14 +7,14 @@ size unnecessarily. > > Signed-off-by: Michael Olbrich <[email protected]> > --- > - mesonbuild/linkers.py | 8 ++++++-- > + mesonbuild/linkers/linkers.py | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > -diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py > -index 589945c511ff..59463bdfdcc5 100644 > ---- a/mesonbuild/linkers.py > -+++ b/mesonbuild/linkers.py > -@@ -605,7 +605,10 @@ class GnuLikeDynamicLinkerMixin: > +diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py > +index 334fc4f24e13..9545744b9bca 100644 > +--- a/mesonbuild/linkers/linkers.py > ++++ b/mesonbuild/linkers/linkers.py > +@@ -640,7 +640,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 589945c511ff..59463bdfdcc5 100644 > rpath_dirs_to_remove = set() > for p in all_paths: > rpath_dirs_to_remove.add(p.encode('utf8')) > -@@ -633,7 +636,8 @@ class GnuLikeDynamicLinkerMixin: > +@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin: > paths = padding > else: > paths = paths + ':' + padding > diff --git a/patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch > b/patches/meson-0.60.2/0101-HACK-enable-NEON-only-for-ARMv7.patch > similarity index 91% > rename from patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch > rename to patches/meson-0.60.2/0101-HACK-enable-NEON-only-for-ARMv7.patch > index f6f0dc44818e..f6c355728034 100644 > --- a/patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch > +++ b/patches/meson-0.60.2/0101-HACK-enable-NEON-only-for-ARMv7.patch > @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 3 insertions(+) > > diff --git a/mesonbuild/modules/unstable_simd.py > b/mesonbuild/modules/unstable_simd.py > -index 4c066fb91339..e4b1824a7087 100644 > +index 3339cea5a03f..da2e740d4cd3 100644 > --- a/mesonbuild/modules/unstable_simd.py > +++ b/mesonbuild/modules/unstable_simd.py > -@@ -62,6 +62,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-0.56.0/series b/patches/meson-0.60.2/series > similarity index 61% > rename from patches/meson-0.56.0/series > rename to patches/meson-0.60.2/series > index 10eaa55734b1..9c5fc70fddcf 100644 > --- a/patches/meson-0.56.0/series > +++ b/patches/meson-0.60.2/series > @@ -1,7 +1,6 @@ > # generated by git-ptx-patches > #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 > +# 33cfd20a0dde8e2402f10a8f1e93fe81 - git-ptx-patches magic > diff --git a/rules/host-meson.make b/rules/host-meson.make > index 98c4e453ba36..dd9bc37ee1af 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 := 0.56.0 > -HOST_MESON_MD5 := 67ce2c0c3eab1b8ee9ddaa1c5143e7c0 > +HOST_MESON_VERSION := 0.60.2 > +HOST_MESON_MD5 := 48a898e25f35e57a1b72c2b578884960 > 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) _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
