Skip to contentSkip to conversation

mesa: update llvm-config RPATH

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

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mesa: update llvm-config RPATH

RPATH on the llvm-config binary is set wrong which leads to.

llvm-config: error while loading shared libraries: libtinfo.so.5:
cannot open shared object file: No such file or directory

AND

File "/../../../mesa/<version>/recipe-sysroot-native/usr/lib/python3.11/re/__init__.py", line 223, in finditer
return _compile(pattern, flags).finditer(string)

           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

TypeError: expected string or bytes-like object, got 'NoneType'

Which in turn leads to meson configure failures as the llvm version number isn't properly returned.

The libtinfo.so.5 library can be found in STAGING_BASELIBDIR update rpath on llvm-config to STAGING_BASELIBDIR. So, that meson configure succeeds.

---
 meta/recipes-graphics/mesa/mesa.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +6 -1
index 7dbca5876a..77f9a5c81d 100644
@@ -64,6 +64,11 @@ do_configure:prepend () {
 	if [ -e ${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE} ]; then
 		cp ${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE} ${STAGING_BINDIR}
 		cp ${STAGING_BINDIR_NATIVE}/llvm-config ${STAGING_BINDIR}
+
+		# RPATH on the llvm-config binary is set wrong which leads to
+		# llvm-config: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory
+		# Which in turn leads to meson configure failures as the llvm-config version number isn't properly returned
+		chrpath --replace ${STAGING_BASELIBDIR} ${STAGING_BINDIR}/llvm-config
 	fi
 }
 
@@ -227,7 +232,7 @@ do_install:append () {
     rm -f ${D}${libdir}/gallium-pipe/*.la
     rm -f ${D}${libdir}/gbm/*.la
 
-    # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 
+    # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
     chrpath --delete ${D}${libdir}/dri/*_dri.so || true
 
     # libwayland-egl has been moved to wayland 1.15+
Signature · 1 line
2.34.1
#1 lore raw

And same here: if the issue is in llvm-config, then it shouldn't be fixed up after the fact in mesa.

Alex

Quoted 62 lines · Vincent Davis Jr

RPATH on the llvm-config binary is set wrong which leads to.

llvm-config: error while loading shared libraries: libtinfo.so.5:
cannot open shared object file: No such file or directory

AND

File "/../../../mesa/<version>/recipe-sysroot-native/usr/lib/python3.11/re/__init__.py", line 223, in finditer
return _compile(pattern, flags).finditer(string)

           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

TypeError: expected string or bytes-like object, got 'NoneType'

Which in turn leads to meson configure failures as the llvm version number isn't properly returned.

The libtinfo.so.5 library can be found in STAGING_BASELIBDIR update rpath on llvm-config to STAGING_BASELIBDIR. So, that meson configure succeeds.

---
 meta/recipes-graphics/mesa/mesa.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +6 -2
index 7dbca5876a..77f9a5c81d 100644
@@ -64,6 +64,11 @@ do_configure:prepend () {
        if [ -e ${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE} ]; then
                cp ${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE} ${STAGING_BINDIR}
                cp ${STAGING_BINDIR_NATIVE}/llvm-config ${STAGING_BINDIR}
+
+               # RPATH on the llvm-config binary is set wrong which leads to
+               # llvm-config: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory
+               # Which in turn leads to meson configure failures as the llvm-config version number isn't properly returned
+               chrpath --replace ${STAGING_BASELIBDIR} ${STAGING_BINDIR}/llvm-config
        fi
 }
 
@@ -227,7 +232,7 @@ do_install:append () {
     rm -f ${D}${libdir}/gallium-pipe/*.la
     rm -f ${D}${libdir}/gbm/*.la
 
-    # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
+    # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
     chrpath --delete ${D}${libdir}/dri/*_dri.so || true
 
     # libwayland-egl has been moved to wayland 1.15+
--

2.34.1

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