diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2022-01-28 13:08:45 +0200 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2022-01-28 13:45:57 +0200 |
| commit | 9cc8100eef72bf1235c3b87430e4c2f6d396f128 (patch) | |
| tree | dfdfc260f12be83b214644baf3c1e717b355c4cf | |
| parent | 26c37c4140ce5739d646c104f1e378b2c5d8ec27 (diff) | |
meson.build: Don't set the dependency type for wayland-scannermarlin_12.92.0marlin/12.92.012.92.0
meson (0.53) seem to be smart enough to resolve cross-compile
dependencies without setting explicitly the dependency type.
Setting the dependency as native results in ignoring PKG_CONFIG_PATH
and using PATH to choose and alternative pkg-config. Sourcing the
yocto/OE toolchain would result in picking the hosts pkg-config due to
modified a PATH where SDKTARGETSYSROOT is before any of the hosts paths.
Combined that with the fact that PKG_CONFIG_PATH is reset when the
dependency is se to native (why that hapens is something to further
investigate) results in not finding wayland-scanner.
Tested with both yocto/OE toolchains and native (local) builds to make
sure we can still build it and seems we're fine.
Bug-AGL: SPEC-4169
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I5c4b12eff044aeb0c3ab4c18e943da4e15d6c411
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index bc8961d..218779d 100644 --- a/meson.build +++ b/meson.build @@ -44,7 +44,7 @@ endforeach dep_libsystemd = dependency('libsystemd', required: false) dep_libsmack = dependency('libsmack', required: false) -dep_scanner = dependency('wayland-scanner', native: true) +dep_scanner = dependency('wayland-scanner') prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) dep_wp = dependency('wayland-protocols', version: '>= 1.18') dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir') |