JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: 0.56.0 → 0.57.1

Browse Source 
- https://mesonbuild.com/Release-notes-for-0-57-0.html
- https://github.com/mesonbuild/meson/releases/tag/0.57.0
- https://github.com/mesonbuild/meson/releases/tag/0.57.1
This commit is contained in:
Jan Tojnar 2021-02-20 15:25:04 +01:00
parent 7d4b0acfb5
commit 3242c2f8ae
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
View File

@ -1,14 +1,14 @@
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -491,7 +491,6 @@ class CoreData:
@@ -506,7 +506,6 @@ class CoreData:
return value
if option.endswith('dir') and value.is_absolute() and \
option not in builtin_dir_noprefix_options:
if option.name.endswith('dir') and value.is_absolute() and \
option not in BULITIN_DIR_NOPREFIX_OPTIONS:
- # Value must be a subdir of the prefix
# commonpath will always return a path in the native format, so we
# must use pathlib.PurePath to do the same conversion before
# comparing.
@@ -503,7 +502,7 @@ class CoreData:
@@ -518,7 +517,7 @@ class CoreData:
try:
value = value.relative_to(prefix)
except ValueError:

4
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "0.56.0";
version = "0.57.1";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799";
sha256 = "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj";
};
patches = [

10
pkgs/development/tools/build-managers/meson/more-env-vars.patch
View File

@ -1,8 +1,8 @@
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index 219b62ec8..e3ceaddbd 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice,
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 756dd8193..a5cc6ef8b 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -151,7 +151,7 @@ def _get_env_var(for_machine: MachineChoice, is_cross: bool, var_name: str) -> T
# compiling we fall back on the unprefixed host version. This
# allows native builds to never need to worry about the 'BUILD_*'
# ones.