]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
mesa3d: fix build with BR2_SHARED_STATIC_LIBS
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Sun, 5 Nov 2017 10:49:58 +0000 (11:49 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 11 Nov 2017 22:40:13 +0000 (23:40 +0100)
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>
package/mesa3d/mesa3d.mk

index 9305523bdf57abe734069dd82433aa1c804c1491..5627344f02570c2abd6232748e94afa5a2274ac6 100644 (file)
@@ -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.