]> code.ossystems Code Review - openembedded-core.git/commitdiff
mesa: ensure all libwayland-egl* files are removed
authorDenys Dmytriyenko <denys@ti.com>
Wed, 9 May 2018 16:15:30 +0000 (12:15 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 11 May 2018 06:49:32 +0000 (07:49 +0100)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-graphics/mesa/mesa.inc

index 5d4a452d33a5d354538cf6b6f16b9132264a444f..8bf417ac7376c5fdabb8fb6fab90cdebb1b6744a 100644 (file)
@@ -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
 }