diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2015-06-07 23:11:22 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-07-11 00:30:54 +0200 |
| commit | 1bd494f0a8fdeb4ebea9fd8df5bfe186f5b4f455 (patch) | |
| tree | 62114e5924d17b997bae8d09fba595353d8dfdab | |
| parent | 5ba276de2a8f0387304e870995aa6d9a65e33e4a (diff) | |
| download | buildroot-1bd494f0a8fdeb4ebea9fd8df5bfe186f5b4f455.tar.gz buildroot-1bd494f0a8fdeb4ebea9fd8df5bfe186f5b4f455.zip | |
package/mesa3d: Remove libGL headers/pkgconfig when OpenGL is disabled
mesa3d defaults to --enable-opengl due to its weird configure.ac:
http://git.buildroot.net/buildroot/commit/package/mesa3d/mesa3d.mk?id=384d601d4ea2c41bb7928f756bfe88af4d38b38b
This leads to include/GL/*.h and lib/pkgconfig/gl.pc being installed to
STAGING_DIR. These files are enough for other packages to wrongly assume
that libGL.so is present, like vlc.
Fixes
http://autobuild.buildroot.net/results/e63/e639dabfb260006acb8a204851b96f9275ce53a7/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/mesa3d/mesa3d.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index e8844f0543..118f071ad9 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -85,9 +85,16 @@ MESA3D_CONF_OPTS += \ --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) endif +define MESA3D_REMOVE_OPENGL_PC + rm -f $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc + rm -f $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc + rm -rf $(STAGING_DIR)/usr/include/GL/ +endef + ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ --without-dri-drivers --without-dri --disable-dri3 +MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC else ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto @@ -110,7 +117,8 @@ endif # Always enable OpenGL: # - it is needed for GLES (mesa3d's ./configure is a bit weird) -# - but if no DRI driver is enabled, then libgl is not built +# - but if no DRI driver is enabled, then libgl is not built, +# remove dri.pc and gl.pc in this case (MESA3D_REMOVE_OPENGL_PC) MESA3D_CONF_OPTS += --enable-opengl ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) |
