Skip to contentSkip to conversation

mesa: on x64 machines llvm-config --libdir locate libraries

PATCH In review Vincent Davis Jr 2 participants 3 messages Nov 11, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mesa: on x64 machines llvm-config --libdir locate libraries

mesa's meson requires the llvm-config --libdir command which in turn returns ${STAGING_EXECPREFIXDIR}/lib, but on an x86_64 bit machine libs are located at ${STAGING_EXECPREFIXDIR}/lib64. Symlink directories so that the when llvm-config --libdir is called proper libraries are located.

---
 meta/recipes-graphics/mesa/mesa.inc | 8 ++++++++
 1 file changed, 8 insertions(+)
meta/recipes-graphics/mesa/mesa.inc +8 -0
index 77f9a5c81d..76247932ec 100644
@@ -72,6 +72,14 @@ do_configure:prepend () {
 	fi
 }
 
+do_configure:prepend:x86-64:class-target () {
+	# mesa's meson requires the llvm-config --libdir command which in turn
+	# returns ${STAGING_EXECPREFIXDIR}/lib, but on an x86_64 bit machine
+	# libs are located at ${STAGING_EXECPREFIXDIR}/lib64. Symlink directories
+	# so that the when llvm-config --libdir is called proper libraries are located.
+	ln -fs ${STAGING_LIBDIR} ${STAGING_EXECPREFIXDIR}/lib
+}
+
 # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug'
 # by default the upstream mesa sources build a debug release
 # here we assume the user will want a release build by default
Signature · 1 line
2.34.1
#1 lore raw

This seems like brittle special-casing for a specific target. Can we fix the issue in llvm-config itself, so that it returns the correct path?

Alex

Quoted 42 lines · Vincent Davis Jr

mesa's meson requires the llvm-config --libdir command which in turn returns ${STAGING_EXECPREFIXDIR}/lib, but on an x86_64 bit machine libs are located at ${STAGING_EXECPREFIXDIR}/lib64. Symlink directories so that the when llvm-config --libdir is called proper libraries are located.

---
 meta/recipes-graphics/mesa/mesa.inc | 8 ++++++++
 1 file changed, 8 insertions(+)
meta/recipes-graphics/mesa/mesa.inc +8 -1
index 77f9a5c81d..76247932ec 100644
@@ -72,6 +72,14 @@ do_configure:prepend () {
        fi
 }
 
+do_configure:prepend:x86-64:class-target () {
+       # mesa's meson requires the llvm-config --libdir command which in turn
+       # returns ${STAGING_EXECPREFIXDIR}/lib, but on an x86_64 bit machine
+       # libs are located at ${STAGING_EXECPREFIXDIR}/lib64. Symlink directories
+       # so that the when llvm-config --libdir is called proper libraries are located.
+       ln -fs ${STAGING_LIBDIR} ${STAGING_EXECPREFIXDIR}/lib
+}
+
 # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug'
 # by default the upstream mesa sources build a debug release
 # here we assume the user will want a release build by default
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173120): https://lists.openembedded.org/g/openembedded-core/message/173120
Mute This Topic: https://lists.openembedded.org/mt/94954642/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-