package/mesa3d/0004-configure.ac-invert-order-for-wayland-scanner-check.patch

   1 From 60ee5191a0c074251862a15b12afdc9db0b2df38 Mon Sep 17 00:00:00 2001
   2 From: Gustavo Zacarias <gustavo@zacarias.com.ar>
   3 Date: Thu, 17 Nov 2016 15:36:54 -0300
   4 Subject: [PATCH] configure.ac: invert order for wayland-scanner check
   5
   6 When cross-compiling the .pc file might point to the wrong
   7 wayland-scanner binary (target rather than host) resulting in a
   8 non-executable and wrong scanner.
   9 Try searching the PATH first, and if that fails fall back into
  10 pkg-config.
  11
  12 [Vincent: tweak patch for 17.1.1 version]
  13
  14 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  15 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  16 ---
  17  configure.ac | 8 ++++----
  18  1 file changed, 4 insertions(+), 4 deletions(-)
  19
  20 diff --git a/configure.ac b/configure.ac
  21 index 2c7e636..0198d52 100644
  22 --- a/configure.ac
  23 +++ b/configure.ac
  24 @@ -2174,11 +2174,11 @@ if test "x$with_platforms" != xauto; then
  25      with_egl_platforms=$with_platforms
  26  fi
  27
  28 -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
  29 -        WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
  30 -        WAYLAND_SCANNER='')
  31 +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
  32  if test "x$WAYLAND_SCANNER" = x; then
  33 -    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
  34 +       PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
  35 +               WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
  36 +               WAYLAND_SCANNER='')
  37  fi
  38
  39  # Do per-EGL platform setups and checks
  40 --
  41 2.7.3
  42