diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index bf2ab6e4de..bed311505c 100644 --- 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.