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

   1 From 963428f914c42270d3312d4f0c0840565521534e Mon Sep 17 00:00:00 2001
   2 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
   3 Date: Wed, 16 Nov 2016 00:41:51 +0200
   4 Subject: [PATCH 2/2] configure.ac: Fix wayland-scanner and protocols locations
   5
   6 We want to use the wayland-scanner in path (native sysroot)
   7 instead of using pkg-config which gives us target paths.
   8
   9 The protocols paths on the other hand need to be prefixed with the
  10 (allarch) sysroot because, again, pkg-config gives us target paths.
  11
  12 Upstream-Status: Inappropriate [embedded specific]
  13 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  14 ---
  15  configure.ac | 6 ++----
  16  1 file changed, 2 insertions(+), 4 deletions(-)
  17
  18 diff --git a/configure.ac b/configure.ac
  19 index 58f1567..383a7df 100644
  20 --- a/configure.ac
  21 +++ b/configure.ac
  22 @@ -2525,11 +2525,9 @@ if test "x$XWAYLAND" = xyes; then
  23                 AC_MSG_ERROR([Xwayland requires CLOCK_MONOTONIC support.])
  24         fi
  25
  26 -       WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
  27 -       AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],,
  28 -                    [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
  29 +       AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
  30
  31 -       AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
  32 +       AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
  33  fi
  34
  35
  36 --
  37 2.1.4
  38