summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@mikrodidakt.se>2014-12-26 19:44:06 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2014-12-29 09:43:54 -0200
commit289262d8e6d4ade814dc2426e1ce32067a2180e1 (patch)
tree562b1b1ac9211c03d151f5523b559a8fbd30ba9f
parentcaa153361370d69394cf2208b2f4821fda33eba3 (diff)
downloadmeta-fsl-arm-289262d8e6d4ade814dc2426e1ce32067a2180e1.tar.gz
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 <jacob.kroon@mikrodidakt.se> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc10
1 files changed, 10 insertions, 0 deletions
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 2afbcb0..d14b9d0 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
@@ -180,6 +180,16 @@ do_install () {
180 ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2 180 ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
181 ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so 181 ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so
182 182
183 # FIXME: The libGL.so* libraries depend on the X11 libraries and
184 # libglapi.so from mesa. For non-X11 distros, neither of them are listed
185 # as build dependencies, which can lead to non-deterministic package
186 # dependencies. If the intention is that the GL backend should be usable
187 # without X11, the linking should be fixed. For now just skip
188 # packaging them.
189 if [ "${USE_X11}" = "no" ]; then
190 rm ${D}${libdir}/libGL.*
191 fi
192
183 # skip packaging wayland libraries if no support is requested 193 # skip packaging wayland libraries if no support is requested
184 if [ "${USE_WL}" = "no" ]; then 194 if [ "${USE_WL}" = "no" ]; then
185 rm ${D}${libdir}/libgc_wayland_protocol.* 195 rm ${D}${libdir}/libgc_wayland_protocol.*