mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
weston: fix build failure due to race condition
The wayland.c actually include 'xdg-shell-client-protocol.h' instead of the server one, so fix it. Otherwise, it's possible to get build failure due to race condition. (From OE-Core rev: bd2a9a4d82f66f1ff414c392bcf234d8dbd5e553) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,32 @@
|
|||||||
|
From a2ba4714a6872e547621d29d9ddcb0f374b88cf6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chen Qi <Qi.Chen@windriver.com>
|
||||||
|
Date: Tue, 20 Apr 2021 20:42:18 -0700
|
||||||
|
Subject: [PATCH] meson.build: fix incorrect header
|
||||||
|
|
||||||
|
The wayland.c actually include 'xdg-shell-client-protocol.h' instead of
|
||||||
|
the server one, so fix it. Otherwise, it's possible to get build failure
|
||||||
|
due to race condition.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||||
|
---
|
||||||
|
libweston/backend-wayland/meson.build | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libweston/backend-wayland/meson.build b/libweston/backend-wayland/meson.build
|
||||||
|
index 7e82513..29270b5 100644
|
||||||
|
--- a/libweston/backend-wayland/meson.build
|
||||||
|
+++ b/libweston/backend-wayland/meson.build
|
||||||
|
@@ -10,7 +10,7 @@ srcs_wlwl = [
|
||||||
|
fullscreen_shell_unstable_v1_protocol_c,
|
||||||
|
presentation_time_protocol_c,
|
||||||
|
presentation_time_server_protocol_h,
|
||||||
|
- xdg_shell_server_protocol_h,
|
||||||
|
+ xdg_shell_client_protocol_h,
|
||||||
|
xdg_shell_protocol_c,
|
||||||
|
]
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
@@ -11,6 +11,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
|
|||||||
file://xwayland.weston-start \
|
file://xwayland.weston-start \
|
||||||
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
|
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
|
||||||
file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \
|
file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \
|
||||||
|
file://0001-meson.build-fix-incorrect-header.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch "
|
SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch "
|
||||||
|
|||||||
Reference in New Issue
Block a user