30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
|
From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||
|
|
Date: Wed, 11 May 2016 16:16:30 +0300
|
||
|
|
Subject: [PATCH] configure.ac: Fix wayland-protocols path
|
||
|
|
|
||
|
|
The wayland-protocols directory is used during build: Fix the path
|
||
|
|
to point to sysroot specified in recipe.
|
||
|
|
|
||
|
|
Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that
|
||
|
|
breaks multilib weston as it would point to multilib sysroot when the
|
||
|
|
(allarch) wayland-protocols is actually in the machine sysroot.
|
||
|
|
|
||
|
|
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||
|
|
Upstream-Status: Inappropriate [embedded specific]
|
||
|
|
---
|
||
|
|
configure.ac | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib
|
||
|
|
PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
|
||
|
|
|
||
|
|
PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7],
|
||
|
|
- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
|
||
|
|
+ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
|
||
|
|
AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
|
||
|
|
|
||
|
|
AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],,
|