mirror of
https://gitlab.freedesktop.org/wayland/wayland.git
synced 2026-03-04 01:42:03 -05:00
build: Bump to meson version 0.64.0
This version will be required in the next commit. Bumps the CI image to get the required version from the debian package instead of from pip. Removes the bindir builtin directory from pkgconfig.generate() which is deprecated since 0.62.0. It will be automatically included when referenced. Use `meson setup` everywhere instead of relying on deprecated automatic detection of the setup command. Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>
This commit is contained in:
parent
dfab16e236
commit
c8a0996703
3 changed files with 8 additions and 11 deletions
|
|
@ -66,7 +66,6 @@ if get_option('scanner')
|
|||
variables: [
|
||||
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
|
||||
'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()),
|
||||
'bindir=' + join_paths('${prefix}', get_option('bindir')),
|
||||
'wayland_scanner=${bindir}/wayland-scanner'
|
||||
],
|
||||
filebase: 'wayland-scanner'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue