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

   1 From 2582d2653ba80917d7bc47088e1a5f49530fddaa 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  src/meson.build | 3 +--
  12  1 file changed, 1 insertion(+), 2 deletions(-)
  13
  14 diff --git a/src/meson.build b/src/meson.build
  15 index 3e8c9bf..294aee0 100644
  16 --- a/src/meson.build
  17 +++ b/src/meson.build
  18 @@ -55,8 +55,7 @@ pkgconfig.generate(
  19  )
  20
  21  if meson.is_cross_build()
  22 -       scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')
  23 -       wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
  24 +       wayland_scanner_for_build = find_program('wayland-scanner')
  25  else
  26         wayland_scanner_for_build = wayland_scanner
  27  endif