aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2017-11-05 11:49:58 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-11-26 22:29:16 +0100
commit362b716f8f88a9e8ca8e4f529b9a3bfe35de9175 (patch)
tree82b0769e85a4e4367bab21aaa35ac60031903316
parent01aef13b4bdd16c61a8bcc64efc9f2bf1bb0769e (diff)
downloadbuildroot-362b716f8f88a9e8ca8e4f529b9a3bfe35de9175.tar.gz
buildroot-362b716f8f88a9e8ca8e4f529b9a3bfe35de9175.tar.bz2
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>
-rw-r--r--package/mesa3d/mesa3d.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 1654046f02..3b2858b13f 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.