41d3f59002
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From ef96bac7cbbb11b98606864ead0f731dd5b71d5a Mon Sep 17 00:00:00 2001
|
|
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Date: Thu, 17 Nov 2016 15:36:54 -0300
|
|
Subject: [PATCH] configure.ac: invert order for wayland-scanner check
|
|
|
|
When cross-compiling the .pc file might point to the wrong
|
|
wayland-scanner binary (target rather than host) resulting in a
|
|
non-executable and wrong scanner.
|
|
Try searching the PATH first, and if that fails fall back into
|
|
pkg-config.
|
|
|
|
[Vincent: tweak patch for 17.1.1 version]
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
[Romain: rebase on 18.1]
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
[Bernd rebase on 18.3]
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
configure.ac | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f1fbdcc6c7..dcf87e7dd6 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1841,17 +1841,16 @@
|
|
fi
|
|
WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
|
|
|
|
- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
|
|
+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
|
|
+ if test "x$WAYLAND_SCANNER" = x; then
|
|
+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
|
|
WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
|
|
WAYLAND_SCANNER='')
|
|
+ fi
|
|
PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
|
|
AC_SUBST(SCANNER_ARG, 'private-code'),
|
|
AC_SUBST(SCANNER_ARG, 'code'))
|
|
|
|
- if test "x$WAYLAND_SCANNER" = x; then
|
|
- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
|
|
- fi
|
|
-
|
|
if test "x$WAYLAND_SCANNER" = "x:"; then
|
|
AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
|
|
fi
|
|
--
|
|
2.14.3
|