mesa: ensure all libwayland-egl* files are removed

Message ID 1525882530-55742-1-git-send-email-denis@denix.org
State New
Headers show
Series
  • mesa: ensure all libwayland-egl* files are removed
Related show

Commit Message

Denys Dmytriyenko May 9, 2018, 4:15 p.m.
From: Denys Dmytriyenko <denys@ti.com>


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 <denys@ti.com>

---
 meta/recipes-graphics/mesa/mesa.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 354271e..314d327 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -135,7 +135,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
 }