Make sure libraries are installed correctly even when libdir is not /usr/lib. Fixes:
| ERROR: intel-crypto-mb-2021.6-r0 do_package: QA Issue: intel-crypto-mb: Files/directories were installed but not shipped in any package: | /usr/lib/libcrypto_mb.so.11.4 | /usr/lib/libcrypto_mb.so.11 | /usr/lib/libcrypto_mb.so | /usr/lib/libcrypto_mb.a Signed-off-by: Anuj Mittal <[email protected]> --- ...ke-sure-libs-are-installed-correctly.patch | 42 +++++++++++++++++++ .../crypto/intel-crypto-mb_2021.7.1.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch diff --git a/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch b/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch new file mode 100644 index 00000000..5950ee65 --- /dev/null +++ b/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch @@ -0,0 +1,42 @@ +From c83c4401a5535419a286d0efaf1fc037d83384f7 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Wed, 14 Jun 2023 13:18:45 +0800 +Subject: [PATCH] crypto-mb: Make sure libs are installed correctly + +Dont assume that "lib" is always the correct destination. This fixes +multilib builds when libdir != /usr/lib. + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal <[email protected]> +--- + sources/ippcp/crypto_mb/src/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sources/ippcp/crypto_mb/src/CMakeLists.txt b/sources/ippcp/crypto_mb/src/CMakeLists.txt +index c9cad06..1e58a97 100644 +--- a/sources/ippcp/crypto_mb/src/CMakeLists.txt ++++ b/sources/ippcp/crypto_mb/src/CMakeLists.txt +@@ -123,8 +123,8 @@ endif(DYNAMIC_LIB OR MB_STANDALONE) + # Installation of the shared library + if (MB_STANDALONE) # standalone crypto_mb's cmake run + install(TARGETS ${MB_DYN_LIB_TARGET} +- LIBRARY DESTINATION "lib" +- RUNTIME DESTINATION "lib" ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION "include/crypto_mb") + elseif (DYNAMIC_LIB) # build from ippcp's cmake + install(TARGETS ${MB_DYN_LIB_TARGET} +@@ -154,7 +154,7 @@ endif() + # Static lib installation + if(MB_STANDALONE) + install(TARGETS ${MB_STATIC_LIB_TARGET} +- ARCHIVE DESTINATION "lib" ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION "include/crypto_mb") + else() + install(TARGETS ${MB_STATIC_LIB_TARGET} +-- +2.37.3 + diff --git a/recipes-oneapi/crypto/intel-crypto-mb_2021.7.1.bb b/recipes-oneapi/crypto/intel-crypto-mb_2021.7.1.bb index a11ed04b..36cae430 100644 --- a/recipes-oneapi/crypto/intel-crypto-mb_2021.7.1.bb +++ b/recipes-oneapi/crypto/intel-crypto-mb_2021.7.1.bb @@ -12,6 +12,7 @@ SRC_URI = " \ git://github.com/intel/ipp-crypto;protocol=https;branch=ipp-crypto_2021_7_1 \ file://0001-CMakeLists.txt-exclude-host-system-headers.patch;striplevel=4 \ file://0002-cmake-exclude-Yocto-build-flags.patch;striplevel=4 \ + file://0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch;striplevel=4 \ " SRCREV = "8e1f90d507bc4d73b3860745d491837c6c57a804" -- 2.40.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8002): https://lists.yoctoproject.org/g/meta-intel/message/8002 Mute This Topic: https://lists.yoctoproject.org/mt/99522949/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/leave/6694807/21656/1869269227/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
