[Buildroot] [PATCH 3/3] package/glmark2: fix selection of dependencies
Yann E. MORIN
yann.morin.1998 at free.fr
Sat Nov 13 09:52:19 UTC 2021
Bernd, All,
On 2021-11-13 10:30 +0100, Bernd Kuhls spake thusly:
> 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, that option is true as soon as the 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 codition would need to be on two lines anyway,
> so meh...
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
Aha! I see you re-used my previous commit as-is. You even kept all my
typoes! ;-)
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> Requested by Yann:
> http://lists.busybox.net/pipermail/buildroot/2021-November/628389.html
>
> 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 6761397d3f..5897ccb3ff 100644
> --- a/package/glmark2/Config.in
> +++ b/package/glmark2/Config.in
> @@ -27,7 +27,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
> @@ -36,7 +35,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
> @@ -68,6 +66,8 @@ config BR2_PACKAGE_GLMARK2
> select BR2_PACKAGE_JPEG
> select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
> 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.
>
> --
> 2.30.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list