]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/mesa3d: Execute MESA3D_REMOVE_OPENGL_PC also for DRI configs lacking OpenGL
authorBernd Kuhls <bernd.kuhls@t-online.de>
Tue, 17 May 2016 18:41:39 +0000 (20:41 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 24 May 2016 21:06:56 +0000 (23:06 +0200)
Mesa3d provides libgl only with DRI drivers and X.org enabled. Since

https://git.busybox.net/buildroot/commit/package/mesa3d/mesa3d.mk?id=f1894ec95728806e09405d26663e0ea371afaeab

DRI drivers can be enabled without X.org support, but mesa3d still does
not provide OpenGL support so we also need to remove the pkgconf files
in this case. A POST_INSTALL_*_HOOK is already present but needs to be
executed not only when DRI support was disabled but also with DRI en-
and X.org disabled.

Fixes
http://autobuild.buildroot.net/results/342/3420ad6aa8e1e8151bf11b43be2c97cbe1dbb400/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/mesa3d/mesa3d.mk

index 4e0d25540738b844f70d975a52379ff06ec69fc5..3c98f8dd79fc33ad950b1ce5da74c6cd986557f1 100644 (file)
@@ -108,6 +108,8 @@ endif
 # libGL is only provided for a full xorg stack
 ifeq ($(BR2_PACKAGE_XORG7),y)
 MESA3D_PROVIDES += libgl
+else
+MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC
 endif
 MESA3D_CONF_OPTS += \
        --enable-shared-glapi \