diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-01-18 16:58:24 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-15 14:32:26 +0100 |
| commit | fa75a6dd63395c88a7fbbb95152d07aaa3f35357 (patch) | |
| tree | f38a2b057a5bd06336a8aac1086346b20a478930 | |
| parent | 6939a51e49b110539f33b95c339b987f0f8f1825 (diff) | |
| download | ptxdist-fa75a6dd63395c88a7fbbb95152d07aaa3f35357.tar.gz ptxdist-fa75a6dd63395c88a7fbbb95152d07aaa3f35357.tar.xz | |
host-meson: version bump 0.44.1 -> 0.49.2
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/meson-0.44.1/0001-increase-maximum-struct-size-for-cross_sizeof.patch | 26 | ||||
| -rw-r--r-- | patches/meson-0.44.1/series | 4 | ||||
| -rw-r--r-- | rules/host-meson.make | 10 |
3 files changed, 5 insertions, 35 deletions
diff --git a/patches/meson-0.44.1/0001-increase-maximum-struct-size-for-cross_sizeof.patch b/patches/meson-0.44.1/0001-increase-maximum-struct-size-for-cross_sizeof.patch deleted file mode 100644 index 671933fbf..000000000 --- a/patches/meson-0.44.1/0001-increase-maximum-struct-size-for-cross_sizeof.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 9 Mar 2018 16:58:12 +0100 -Subject: [PATCH] increase maximum struct size for cross_sizeof() - -Upstream is still discussing a better fix. - -https://github.com/mesonbuild/meson/issues/3113 - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - mesonbuild/compilers/c.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py -index 0841fb2ffe73..c05bf78fe9c0 100644 ---- a/mesonbuild/compilers/c.py -+++ b/mesonbuild/compilers/c.py -@@ -406,7 +406,7 @@ class CCompiler(Compiler): - }}''' - if not self.compiles(t.format(**fargs), env, extra_args, dependencies): - return -1 -- return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) -+ return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies) - - def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): - if extra_args is None: diff --git a/patches/meson-0.44.1/series b/patches/meson-0.44.1/series deleted file mode 100644 index 8382f3034..000000000 --- a/patches/meson-0.44.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-increase-maximum-struct-size-for-cross_sizeof.patch -# 9deed62c05a39765418ad4978e038f1f - git-ptx-patches magic diff --git a/rules/host-meson.make b/rules/host-meson.make index 30dff88fc..7842a4b5d 100644 --- a/rules/host-meson.make +++ b/rules/host-meson.make @@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson # # Paths and names # -HOST_MESON_VERSION := 0.44.1 -HOST_MESON_MD5 := 623ebb89422911ce4fbac6707e2cffc5 +HOST_MESON_VERSION := 0.49.2 +HOST_MESON_MD5 := 6132bfb9ff10b2dd7c370045ab18813f HOST_MESON := meson-$(HOST_MESON_VERSION) HOST_MESON_SUFFIX := tar.gz HOST_MESON_URL := https://github.com/mesonbuild/meson/archive/$(HOST_MESON_VERSION).$(HOST_MESON_SUFFIX) @@ -48,8 +48,8 @@ $(STATEDIR)/host-meson.compile: HOST_MESON_INSTALL_OPT := \ install \ --prefix=/ \ - --install-lib=/share/meson \ - --install-scripts=/share/meson \ + --install-lib=/lib/meson \ + --install-scripts=/lib/meson \ --root=$(HOST_MESON_PKGDIR) $(STATEDIR)/host-meson.install: @@ -58,7 +58,7 @@ $(STATEDIR)/host-meson.install: @cd $(HOST_MESON_DIR) && \ $(SYSTEMPYTHON3) setup.py $(HOST_MESON_INSTALL_OPT) @mkdir -vp $(HOST_MESON_PKGDIR)/bin - @ln -svf ../share/meson/meson $(HOST_MESON_PKGDIR)/bin/meson + @ln -svf ../lib/meson/meson $(HOST_MESON_PKGDIR)/bin/meson @$(call touch) $(STATEDIR)/host-meson.install.post: $(PTXDIST_MESON_CROSS_FILE) |