mesa3d: fix build with BR2_SHARED_STATIC_LIBS

mesa3d does not allow to enable both static and shared libraries so if
BR2_SHARED_STATIC_LIBS is set, disable static

Fixes https://bugs.busybox.net/show_bug.cgi?id=10326

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit dd09d500aa6972808b2549e4b8c7fa4e396ca91f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index bf2ab6e4dea66b5cb402856370895f42bc82eee8..bed311505ce9fc11615a3bb76d8d243c8301d02b 100644 (file)
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -22,6 +22,12 @@ MESA3D_DEPENDENCIES = \
        expat \
        libdrm
 
+# Disable static, otherwise configure will fail with: "Cannot enable both static
+# and shared."
+ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+MESA3D_CONF_OPTS += --disable-static
+endif
+
 # The Sourcery MIPS toolchain has a special (non-upstream) feature to
 # have "compact exception handling", which unfortunately breaks with
 # mesa3d, so we disable it here by passing -mno-compact-eh.