From: Kai Kang <kai.kang@windriver.com>
Date: Tue, 29 May 2018 09:02:07 +0000 (+0800)
Subject: mesa: fix installed-vs-shipped error
X-Git-Tag: uninative-2.1~85
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9e373fec2013c5b2f9297e8f88317628ba9b7dce;p=openembedded-core.git

mesa: fix installed-vs-shipped error

When 'opengl' is not set in DISTRO_FEATURES, ${libdir}/pkgconfig is an
empty directory and cause installed-vs-shipped error.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 8bf417ac73..fa99f7d50c 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -138,6 +138,7 @@ do_install_append () {
     # libwayland-egl has been moved to wayland 1.15+
     rm -f ${D}${libdir}/libwayland-egl*
     rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
+    rmdir --ignore-fail-on-non-empty ${D}${libdir}/pkgconfig
 }
 
 # For the packages that make up the OpenGL interfaces, inject variables so that