mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
weston: remove patch that isn't applied anymore
This patch was removed from SRC_URI in the Weston 3.0 upgrade (148920f) but the patch wasn't deleted. (From OE-Core rev: f03e43153479bf9c58d7feec9a4c3fa1b7dca57d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
299e8ff1f7
commit
a8de48c0c9
-29
@@ -1,29 +0,0 @@
|
|||||||
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],,
|
|
||||||
Reference in New Issue
Block a user