Skip to contentSkip to conversation

mesa3d: specify llvm-prefix

PATCH New Gustavo Zacarias 2 participants 5 messages Mar 30, 2015 – Mar 31, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mesa3d: specify llvm-prefix

When it's not defined an automatic search is triggered, which can find /usr/bin/llvm-config on distributions that include all development files (like gentoo) and have desktop packages installed.
So point it towards the staging dir which is where it should live eventually if/when we've got it to avoid header/include path polution that otherwise leads to build failures.

---
 package/mesa3d/mesa3d.mk | 3 +++
 1 file changed, 3 insertions(+)
package/mesa3d/mesa3d.mk +3 -0
index fc82227..7473110 100644
@@ -128,4 +128,7 @@ else
 MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2
 endif
 
+# Avoid automatic search of llvm-config
+MESA3D_CONF_OPTS += --with-llvm-prefix=$(STAGING_DIR)/usr/bin
+
 $(eval $(autotools-package))
Signature · 1 line
2.0.5
#1 lore raw

PATCH 1/1 mesa3d: specify llvm-prefix

Dear Gustavo Zacarias,

Quoted 17 lines · Gustavo Zacarias

When it's not defined an automatic search is triggered, which can find /usr/bin/llvm-config on distributions that include all development files (like gentoo) and have desktop packages installed.
So point it towards the staging dir which is where it should live eventually if/when we've got it to avoid header/include path polution that otherwise leads to build failures.

---
 package/mesa3d/mesa3d.mk | 3 +++
 1 file changed, 3 insertions(+)
package/mesa3d/mesa3d.mk +0 -0
index fc82227..7473110 100644

package/mesa3d/mesa3d.mk else · line 132

Quoted 5 lines
package/mesa3d/mesa3d.mk +2 -0
@@ -128,4 +128,7 @@ else
 MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2
 endif
 
+# Avoid automatic search of llvm-config
+MESA3D_CONF_OPTS += --with-llvm-prefix=$(STAGING_DIR)/usr/bin

Shouldn't we instead test if LLVM is available, explicitly disable LLVM support if not, and enable it if LLVM is available?

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: specify llvm-prefix

Quoted 5 lines · Thomas Petazzoni

package/mesa3d/mesa3d.mk else · line 132

Quoted 2 lines
package/mesa3d/mesa3d.mk +2 -0
+# Avoid automatic search of llvm-config
+MESA3D_CONF_OPTS += --with-llvm-prefix=$(STAGING_DIR)/usr/bin

Shouldn't we instead test if LLVM is available, explicitly disable LLVM support if not, and enable it if LLVM is available?

We don't have a llvm package in BR, so testing is a non-option. There's no explicit option to disable llvm support, hence this is as close as it gets without patching. (--without-gallium-drivers comes close, but it takes down a whole bunch of other stuff as well).
Regards.

#3 lore raw

PATCH 1/1 mesa3d: specify llvm-prefix

Dear Gustavo Zacarias,

Quoted 8 lines · Gustavo Zacarias
Quoted 5 lines · Thomas Petazzoni

package/mesa3d/mesa3d.mk else · line 132

Quoted 2 lines
package/mesa3d/mesa3d.mk +2 -0
+# Avoid automatic search of llvm-config
+MESA3D_CONF_OPTS += --with-llvm-prefix=$(STAGING_DIR)/usr/bin

Shouldn't we instead test if LLVM is available, explicitly disable LLVM support if not, and enable it if LLVM is available?

We don't have a llvm package in BR, so testing is a non-option.

Well what I meant is that since we don't have a LLVM option right now, we should display LLVM support completely.

And we do have patches in patchwork to add LLVM.

Quoted 4 lines

There's no explicit option to disable llvm support, hence this is as close as it gets without patching. (--without-gallium-drivers comes close, but it takes down a whole bunch of other stuff as well).

Ok. Applied then, thanks.

Thomas

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

PATCH 1/1 mesa3d: specify llvm-prefix

Quoted 4 lines · Thomas Petazzoni

Well what I meant is that since we don't have a LLVM option right now, we should display LLVM support completely.

And we do have patches in patchwork to add LLVM.

Hi.
I missed that.
I'm just fighting some windmills in doing the webkit/midori revamp and fixing accordingly ;)
Regards.