From 79271867e777f15235f737ea7d0af2adffdde6ad Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Fri, 26 Dec 2014 19:44:06 +0100 Subject: [PATCH] gpu-viv-bin-mx6q: Don't package X11 libraries in non-X11 builds Running readelf --dynamic libGL.so | grep NEEDED shows that the library has runtime dependencies on X11 libs and libglapi.so. However, none of them are listed as build dependencies for non-X11 distros. In this case, skip packaging libGL, so that it doesn't cause unexpected dependency changes in buildhistory. Signed-off-by: Jacob Kroon Signed-off-by: Otavio Salvador --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index ba11c6e8..df3af1b9 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -195,6 +195,16 @@ 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 + # FIXME: The libGL.so* libraries depend on the X11 libraries and + # libglapi.so from mesa. For non-X11 distros, neither of them are listed + # as build dependencies, which can lead to non-deterministic package + # dependencies. If the intention is that the GL backend should be usable + # without X11, the linking should be fixed. For now just skip + # packaging them. + 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 +254,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.40.1