summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2018-05-09 12:15:30 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-11 07:49:32 +0100
commit7a1d0f532bb2a6772e24a9fd4515bd1f3ab15324 (patch)
tree4ff282c7ee7a7a7bfe6c7a14eec7c3227d7e61ef
parentd693457f9de92e4e8b61881638787e831f0ca197 (diff)
downloadopenembedded-core-contrib-7a1d0f532bb2a6772e24a9fd4515bd1f3ab15324.tar.gz
openembedded-core-contrib-7a1d0f532bb2a6772e24a9fd4515bd1f3ab15324.tar.bz2
openembedded-core-contrib-7a1d0f532bb2a6772e24a9fd4515bd1f3ab15324.zip
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 <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
1 files changed, 1 insertions, 1 deletions
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
}