[meta-freescale] [meta-fsl-arm][PATCH] gpu-viv-bin-mx6q: Don't package X11 libraries in non-X11 builds

[Jacob Kroon]

Running

  readelf --dynamic libGL.so | grep NEEDED

shows that the library has a runtime dependency on libglapi.so. However,
'mesa' is not a build dependency in non-X11 distros.

For non-X11 builds, where libglapi may or may not be available during
package time, skip packaging libGL, so that it doesn't cause unexpected
dependency changes in buildhistory.

Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index ba11c6e..d4ba008 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -195,6 +195,11 @@ do_install () {
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so
 
+    # skip packaging x11 libraries if no support is requested
+    if [ "${USE_X11}" = "no" ]; then
+        rm ${D}${libdir}/libGL.*
+    fi
+
     # skip packaging wayland libraries if no support is requested
     if [ "${USE_WL}" = "no" ]; then
         rm ${D}${libdir}/libgc_wayland_protocol.*
@@ -244,7 +249,6 @@ INSANE_SKIP_libegl-mx6 += "dev-so"
 FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
 FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
 FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
-RDEPENDS_libgl-mx6 = "libglapi"
 # Includes GL headers from mesa
 RDEPENDS_libgl-mx6-dev += "libgl-mesa-dev"
 
-- 
2.1.0