On Thu, Nov 10, 2022 at 12:42 PM Jordan Crouse via
lists.openembedded.org <jorcrous=amazon....@lists.openembedded.org>
wrote:
>
> 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".
>
> Signed-off-by: Jordan Crouse <jorcr...@amazon.com>
> ---
>
> meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
> b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
> index ea47796543..fdc9c9225a 100644
> --- a/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
> +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> SRCREV = "eb0a36633d2acf4de82588504f951ad0f2cecacb"
> SRC_URI =
> "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
> PE = "1"
> +PR = "r1"
We no longer bump the PR manually. So this is not needed.
> +
> UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
> S = "${WORKDIR}/git"
>
> @@ -25,9 +27,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
> --
> 2.37.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173109):
https://lists.openembedded.org/g/openembedded-core/message/173109
Mute This Topic: https://lists.openembedded.org/mt/94945230/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
