diff options
author | Jacob Kroon <jacob.kroon@mikrodidakt.se> | 2014-12-26 19:44:06 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-12-29 09:35:34 -0200 |
commit | 79271867e777f15235f737ea7d0af2adffdde6ad (patch) | |
tree | 3507d1277d55b2608d6608d8890c732d3ec01cef /meta-fsl-arm/recipes-graphics | |
parent | a7f09fd4089c0dcbc0e21ccc42e582442643d920 (diff) | |
download | meta-freescale-79271867e777f15235f737ea7d0af2adffdde6ad.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>
Diffstat (limited to 'meta-fsl-arm/recipes-graphics')
-rw-r--r-- | meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 11 |
1 files changed, 10 insertions, 1 deletions
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 () { | |||
195 | ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2 | 195 | ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2 |
196 | ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so | 196 | ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so |
197 | 197 | ||
198 | # FIXME: The libGL.so* libraries depend on the X11 libraries and | ||
199 | # libglapi.so from mesa. For non-X11 distros, neither of them are listed | ||
200 | # as build dependencies, which can lead to non-deterministic package | ||
201 | # dependencies. If the intention is that the GL backend should be usable | ||
202 | # without X11, the linking should be fixed. For now just skip | ||
203 | # packaging them. | ||
204 | if [ "${USE_X11}" = "no" ]; then | ||
205 | rm ${D}${libdir}/libGL.* | ||
206 | fi | ||
207 | |||
198 | # skip packaging wayland libraries if no support is requested | 208 | # skip packaging wayland libraries if no support is requested |
199 | if [ "${USE_WL}" = "no" ]; then | 209 | if [ "${USE_WL}" = "no" ]; then |
200 | rm ${D}${libdir}/libgc_wayland_protocol.* | 210 | rm ${D}${libdir}/libgc_wayland_protocol.* |
@@ -244,7 +254,6 @@ INSANE_SKIP_libegl-mx6 += "dev-so" | |||
244 | FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " | 254 | FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " |
245 | FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" | 255 | FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" |
246 | FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}" | 256 | FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}" |
247 | RDEPENDS_libgl-mx6 = "libglapi" | ||
248 | # Includes GL headers from mesa | 257 | # Includes GL headers from mesa |
249 | RDEPENDS_libgl-mx6-dev += "libgl-mesa-dev" | 258 | RDEPENDS_libgl-mx6-dev += "libgl-mesa-dev" |
250 | 259 | ||