-
-
Notifications
You must be signed in to change notification settings - Fork 13.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upstream insists on not allowing bindir and other dir options outside of prefix for some reason: mesonbuild/meson#2561 We remove the check so multiple outputs can work sanely.
- Loading branch information
Showing
2 changed files
with
31 additions
and
0 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
--- a/mesonbuild/coredata.py | ||
+++ b/mesonbuild/coredata.py | ||
@@ -266,18 +266,13 @@ | ||
''' | ||
if option.endswith('dir') and os.path.isabs(value) 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. | ||
- if commonpath([value, prefix]) != str(PurePath(prefix)): | ||
- m = 'The value of the {!r} option is {!r} which must be a ' \ | ||
- 'subdir of the prefix {!r}.\nNote that if you pass a ' \ | ||
- 'relative path, it is assumed to be a subdir of prefix.' | ||
- raise MesonException(m.format(option, value, prefix)) | ||
- # Convert path to be relative to prefix | ||
- skip = len(prefix) + 1 | ||
- value = value[skip:] | ||
+ if commonpath([value, prefix]) == str(PurePath(prefix)): | ||
+ # Convert path to be relative to prefix | ||
+ skip = len(prefix) + 1 | ||
+ value = value[skip:] | ||
return value | ||
|
||
def init_builtins(self, options): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters