From 09a1511abd3ba0f3e20a1e93f36830d344dd1ce3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 17 Feb 2022 18:19:06 +0100 Subject: [PATCH] package/libglvnd: fix LIBGLVND_CONF_OPTS LIBGLVND_CONF_OPTS are wrongly overridden in conditionals since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libglvnd/libglvnd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 3df609f6eb..3bac4b31e2 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -37,17 +37,17 @@ LIBGLVND_CONF_OPTS += -Dglx=disabled endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) -LIBGLVND_CONF_OPTS = -Degl=true +LIBGLVND_CONF_OPTS += -Degl=true LIBGLVND_PROVIDES += libegl else -LIBGLVND_CONF_OPTS = -Degl=false +LIBGLVND_CONF_OPTS += -Degl=false endif ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) -LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true +LIBGLVND_CONF_OPTS += -Dgles1=true -Dgles2=true LIBGLVND_PROVIDES += libgles else -LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false +LIBGLVND_CONF_OPTS += -Dgles1=false -Dgles2=false endif $(eval $(meson-package))