mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-07-21 10:44:25 +00:00
build: fix meson sandbox violation when using wayland-protocols as subproject
When a dependency path is converted to string and dependency is a subproject, then accessing such file fails in meson with: ERROR: Sandbox violation: Tried to grab file ... from a nested subproject. Use '/' operator as documented in https://mesonbuild.com/Dependencies.html#dependencies-that-provide-resource-files Fixes: #715 Signed-off-by: Vasyl Vavrychuk <vvavrychuk@gmail.com>
This commit is contained in:
parent
831e36c7d9
commit
5e1fa146a6
|
@ -48,16 +48,16 @@ foreach proto: generated_protocols
|
||||||
proto_name = proto[0]
|
proto_name = proto[0]
|
||||||
if proto[1] == 'internal'
|
if proto[1] == 'internal'
|
||||||
base_file = proto_name
|
base_file = proto_name
|
||||||
xml_path = '@0@.xml'.format(proto_name)
|
xml_path = proto_name + '.xml'
|
||||||
elif proto[1] == 'stable'
|
elif proto[1] == 'stable'
|
||||||
base_file = proto_name
|
base_file = proto_name
|
||||||
xml_path = '@0@/stable/@1@/@1@.xml'.format(dir_wp_base, base_file)
|
xml_path = dir_wp_base / 'stable' / base_file / (base_file + '.xml')
|
||||||
elif proto[1] == 'unstable'
|
elif proto[1] == 'unstable'
|
||||||
base_file = '@0@-unstable-@1@'.format(proto_name, proto[2])
|
base_file = '@0@-unstable-@1@'.format(proto_name, proto[2])
|
||||||
xml_path = '@0@/unstable/@1@/@2@.xml'.format(dir_wp_base, proto_name, base_file)
|
xml_path = dir_wp_base / 'unstable' / proto_name / (base_file + '.xml')
|
||||||
elif proto[1] == 'staging'
|
elif proto[1] == 'staging'
|
||||||
base_file = '@0@-@1@'.format(proto_name, proto[2])
|
base_file = '@0@-@1@'.format(proto_name, proto[2])
|
||||||
xml_path = '@0@/staging/@1@/@2@.xml'.format(dir_wp_base, proto_name, base_file)
|
xml_path = dir_wp_base / 'staging' / proto_name / (base_file + '.xml')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
foreach output_type: [ 'client-header', 'server-header', 'private-code' ]
|
foreach output_type: [ 'client-header', 'server-header', 'private-code' ]
|
||||||
|
|
Loading…
Reference in a new issue