[Buildroot] [PATCH 1/1] mesa3d: fix build with BR2_SHARED_STATIC_LIBS

[Buildroot] [PATCH 1/1] mesa3d: fix build with BR2_SHARED_STATIC_LIBS

[Fabrice Fontaine]

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>
---
 package/mesa3d/mesa3d.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 9305523bd..5627344f0 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.14.1

[Buildroot] [PATCH 1/1] mesa3d: fix build with BR2_SHARED_STATIC_LIBS

[Thomas Petazzoni]

Hello,

On Sun,  5 Nov 2017 11:49:58 +0100, Fabrice Fontaine wrote:
> 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>
> ---
>  package/mesa3d/mesa3d.mk | 6 ++++++
>  1 file changed, 6 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/1] mesa3d: fix build with BR2_SHARED_STATIC_LIBS

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > 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>

Committed to 2017.02.x and 2017.08.x, thanks.

-- 
Bye, Peter Korsgaard