code.ossystems Code Review - openembedded-core.git/blob

   1 From 98e7902a4ddcd80b61cce6f35f97907e841a5eda Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Sun, 16 Feb 2020 16:29:53 +0100
   4 Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH
   5
   6 Otherwise, meson attempts to use the target pkg-config and fails.
   7
   8 Upstream-Status: Pending
   9 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  10
  11 ---
  12  src/meson.build | 3 +--
  13  1 file changed, 1 insertion(+), 2 deletions(-)
  14
  15 diff --git a/src/meson.build b/src/meson.build
  16 index d91c503..15730a3 100644
  17 --- a/src/meson.build
  18 +++ b/src/meson.build
  19 @@ -59,8 +59,7 @@ if get_option('scanner')
  20  endif
  21
  22  if meson.is_cross_build() or not get_option('scanner')
  23 -       scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
  24 -       wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
  25 +       wayland_scanner_for_build = find_program('wayland-scanner')
  26  else
  27         wayland_scanner_for_build = wayland_scanner
  28  endif