From dd09d500aa6972808b2549e4b8c7fa4e396ca91f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 Nov 2017 11:49:58 +0100 Subject: [PATCH] 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 Signed-off-by: Thomas Petazzoni --- package/mesa3d/mesa3d.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 9305523bdf..5627344f02 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -26,6 +26,12 @@ MESA3D_DEPENDENCIES = \ # Disable assembly usage. MESA3D_CONF_OPTS = --disable-asm +# 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. -- 2.30.2