forked from mirrors/nixpkgs
1a53eeda71
Meson is a delicate package. It needs some patches to properly work in Nixpkgs and many packages have it as a dependency, from many small applications to systemd (yay, mass rebuilds in sight!). Updating it is not a trivial and harmless task. Therefore, I took the paranoid way and encapsulate the current version in a subdir, instead of the regular write-over procedure. This way, at the best we can just remove the whole dir in the future, and at the worse we just maintain duplicated code.
20 lines
852 B
Diff
20 lines
852 B
Diff
--- a/mesonbuild/coredata.py
|
|
+++ b/mesonbuild/coredata.py
|
|
@@ -506,7 +506,6 @@ class CoreData:
|
|
return value
|
|
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.
|
|
@@ -518,7 +517,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()
|