meson: 0.53.2 → 0.54.0

https://mesonbuild.com/Release-notes-for-0-54-0.html
This commit is contained in:
Jan Tojnar 2020-04-16 04:42:45 +02:00 committed by Frederik Rietdijk
parent 3c83abd60f
commit 9073a0cb8b
2 changed files with 14 additions and 20 deletions

View File

@ -1,25 +1,19 @@
--- a/mesonbuild/coredata.py --- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py
@@ -375,18 +375,13 @@ @@ -483,7 +483,6 @@ class CoreData:
''' return value
if option.endswith('dir') and os.path.isabs(value) and \ if option.endswith('dir') and value.is_absolute() and \
option not in builtin_dir_noprefix_options: option not in builtin_dir_noprefix_options:
- # Value must be a subdir of the prefix - # Value must be a subdir of the prefix
# commonpath will always return a path in the native format, so we # commonpath will always return a path in the native format, so we
# must use pathlib.PurePath to do the same conversion before # must use pathlib.PurePath to do the same conversion before
# comparing. # comparing.
- if os.path.commonpath([value, prefix]) != str(PurePath(prefix)): @@ -495,7 +494,7 @@ class CoreData:
- m = 'The value of the {!r} option is {!r} which must be a ' \ try:
- 'subdir of the prefix {!r}.\nNote that if you pass a ' \ value = value.relative_to(prefix)
- 'relative path, it is assumed to be a subdir of prefix.' except ValueError:
- raise MesonException(m.format(option, value, prefix)) - raise MesonException(msg.format(option, value, prefix))
- # Convert path to be relative to prefix + pass
- skip = len(prefix) + 1 if '..' in str(value):
- value = value[skip:] raise MesonException(msg.format(option, value, prefix))
+ if os.path.commonpath([value, prefix]) == str(PurePath(prefix)): return value.as_posix()
+ # Convert path to be relative to prefix
+ skip = len(prefix) + 1
+ value = value[skip:]
return value
def init_builtins(self):

View File

@ -19,11 +19,11 @@ let
in in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "meson"; pname = "meson";
version = "0.53.2"; version = "0.54.0";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8="; sha256 = "3eVybXeBEqy9Sme7NjOrLuddM9HoeaYoOntKRMM2PCc=";
}; };
postFixup = '' postFixup = ''