blob: bb1f1efac71655741b3c74e0ccee6cef60689edf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
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.orig 2016-06-30 18:28:23.586978429 +0900
+++ a/configure.ac 2016-06-30 18:19:28.526994269 +0900
@@ -187,7 +187,7 @@
PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2],
- [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],,
|
