mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 21:17:46 +00:00
c6acf50360
https://github.com/mesonbuild/meson/compare/0.55.0...0.55.1 setuptools have been removed from runtime dependencies: https://github.com/mesonbuild/meson/pull/7461
20 lines
847 B
Diff
20 lines
847 B
Diff
--- a/mesonbuild/coredata.py
|
|
+++ b/mesonbuild/coredata.py
|
|
@@ -491,7 +491,6 @@ class CoreData:
|
|
return value
|
|
if option.endswith('dir') and value.is_absolute() and \
|
|
option not in builtin_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:
|
|
try:
|
|
value = value.relative_to(prefix)
|
|
except ValueError:
|
|
- raise MesonException(msg.format(option, value, prefix))
|
|
+ pass
|
|
if '..' in str(value):
|
|
raise MesonException(msg.format(option, value, prefix))
|
|
return value.as_posix()
|