mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

spirv-tools: Correctly set the prefix in exported cmake packages

Browse Source 
spirv-tools exports Cmake packages.  When they are installed the
INTERFACE_LINK_LIBRARIES variable is not correctly updated to use
_IMPORT_PREFIX like the other variables. This may have something to do with
the path to the sysroot being different than the source path.

The existing recipe recognizes that the sysroot path made it through to the
install and tries to get rid of it, but this just ends up with dependent
tools looking in vain for /usr/lib/librt.so.

Replace the INTERFACE_LINK_LIBRARIES value in SPIRV-ToolsTarget.cmake with
"${IMPORT_PREFIX}/lib".

(From OE-Core rev: ca2d6d9164fba91d86357e56617b58eeeeb76d72)

Signed-off-by: Jordan Crouse <jorcrous@amazon.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jordan Crouse
2022-11-11 21:47:12 +00:00
committed by Richard Purdie
parent 20064a9e2a
commit 130b55bdf3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
+3 -2
View File
@@ -25,9 +25,10 @@ EXTRA_OECMAKE += "\
"
do_install:append:class-target() {
# reproducibility: remove build host path
# Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent
# tools can find the right library
sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \
-e 's:${STAGING_DIR_HOST}::g'
-e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/lib":'
}
# all the libraries are unversioned, so don't pack it on PN-dev