From a5f3db697f37d81b87a99dc3fdce9a6a7f4e0754 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jan 2015 20:16:40 +0100 Subject: [PATCH] package/glmark2: Fix mesa3d dependency Compilation fails with this defconfig, provided by Thomas BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2014.11.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17=y BR2_TOOLCHAIN_EXTERNAL_LARGEFILE=y BR2_TOOLCHAIN_EXTERNAL_INET_IPV6=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_GLMARK2=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_RPI_USERLAND=y because rpi-userland is used a provider for libegl/gles. Fix this by depending on the corresponding mesa3d suboptions. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/glmark2/Config.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in index 2d799fe460..65e077b024 100644 --- a/package/glmark2/Config.in +++ b/package/glmark2/Config.in @@ -1,15 +1,13 @@ config BR2_PACKAGE_GLMARK2_EGL_GLES bool default y - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_MESA3D + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_PACKAGE_MESA3D_OPENGL_ES config BR2_PACKAGE_GLMARK2_GL bool default y - depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_MESA3D + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER comment "glmark2 needs an OpenGL or an openGL ES and EGL backend provided by mesa3d" depends on BR2_LARGEFILE -- 2.30.2