From 8dea79bf8544e6f0629d08ef29f387825192ac16 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 10:30:09 +0100 Subject: [PATCH] package/glmark2: fix selection of dependencies Commit 9c068b4be8 (package/glmark2: fix wayland build) extended the set of required libraries for various "flavor" options by selecting those libraries from the blind options. However, those blind options are true as soon as their requirements are met (the depends on), even when glmark2 itself is not enabled. This means that extra libraries are pulled in to the build, even when not required. We fix that by moving the actual selects to the main symbol, along with the proper conditions. This means that we have two lines that select wayland-protocols, under two different conditions; we could make that a single select, but the condition would need to be on two lines anyway, so meh... Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 4a36af9450d46fed830c62761662da119b3809a3) Signed-off-by: Peter Korsgaard --- package/glmark2/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in index 40d0adcc8a..ddc27479cf 100644 --- a/package/glmark2/Config.in +++ b/package/glmark2/Config.in @@ -24,7 +24,6 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2 depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_WAYLAND select BR2_PACKAGE_GLMARK2_FLAVOR_ANY - select BR2_PACKAGE_WAYLAND_PROTOCOLS config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL bool @@ -33,7 +32,6 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL depends on BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_WAYLAND select BR2_PACKAGE_GLMARK2_FLAVOR_ANY - select BR2_PACKAGE_WAYLAND_PROTOCOLS config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2 bool @@ -64,6 +62,8 @@ config BR2_PACKAGE_GLMARK2 depends on BR2_PACKAGE_GLMARK2_FLAVOR_ANY select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2 help glmark2 is an OpenGL 2.0 and ES 2.0 benchmark.