From 7a1d0f532bb2a6772e24a9fd4515bd1f3ab15324 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 9 May 2018 12:15:30 -0400 Subject: mesa: ensure all libwayland-egl* files are removed Wayland 1.15+ now ships libwayland-egl by itself, so Mesa should remove its instance. Previous commit 6e5952fcfc13ff4b63c9376bd41a1dbba957f425 only removed .so libraries, but left .la, which resulted in conflict. Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 5d4a452d33..8bf417ac73 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -136,7 +136,7 @@ do_install_append () { chrpath --delete ${D}${libdir}/dri/*_dri.so || true # libwayland-egl has been moved to wayland 1.15+ - rm -f ${D}${libdir}/libwayland-egl.so* + rm -f ${D}${libdir}/libwayland-egl* rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc } -- cgit 1.2.3-korg