meson: 0.45.1 → 0.46.1

This commit is contained in:
Jan Tojnar 2018-05-22 20:29:39 +02:00
parent 4a906efce5
commit 405cb86037
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 2 additions and 18 deletions

View file

@ -2,13 +2,13 @@
targetPrefix = lib.optionalString stdenv.isCross
(targetPlatform.config + "-");
in python3Packages.buildPythonApplication rec {
version = "0.45.1";
version = "0.46.1";
pname = "meson";
name = "${pname}-${version}";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14";
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
};
postFixup = ''
@ -43,10 +43,6 @@ in python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch;
inherit (builtins) storeDir;
})
# No one will ever need more than 128 bytes of data structure
# https://github.com/mesonbuild/meson/issues/3113
./overly-strict-size-check.patch
];
setupHook = ./setup-hook.sh;

View file

@ -1,12 +0,0 @@
diff -Naur a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
--- a/mesonbuild/compilers/c.py 2017-12-10 08:37:19.000000000 -0500
+++ b/mesonbuild/compilers/c.py 2018-03-24 07:46:04.739929307 -0400
@@ -406,7 +406,7 @@
}}'''
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: