Skip to contentSkip to conversation

mesa3d: fix build with BR2_SHARED_STATIC_LIBS

PATCH New Fabrice Fontaine 3 participants 3 messages Nov 5, 2017 – Nov 26, 2017

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 package/mesa3d/mesa3d.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/mesa3d/mesa3d.mk +6 -0
index 9305523bd..5627344f0 100644
@@ -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.
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH 1/1 mesa3d: fix build with BR2_SHARED_STATIC_LIBS

Hello,

Quoted 9 lines · 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 <[email protected]>
---
 package/mesa3d/mesa3d.mk | 6 ++++++
 1 file changed, 6 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 mesa3d: fix build with BR2_SHARED_STATIC_LIBS

In reply to Fabrice Fontaine
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> 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 <[email protected]>

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

Signature · 1 line
Bye, Peter Korsgaard