5 files changed, 79 insertions, 31 deletions

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..c47c8de5
--- /dev/null
+++ b/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch
@@ -0,0 +1,42 @@
+From 3b7b4eca54aa8d851e37f60c74e4a027fa7b21f2 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+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 <anuj.mittal@intel.com>
+---
+ 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..31f52bd 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.12.1.bb b/recipes-oneapi/crypto/intel-crypto-mb_2021.12.1.bb
new file mode 100644
index 00000000..61383f82
--- /dev/null
+++ b/recipes-oneapi/crypto/intel-crypto-mb_2021.12.1.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Crypto Multi-buffer Library"
+DESCRIPTION = "Intel® Integrated Performance Primitives (Intel® IPP) Cryptography \
+is a secure, fast and lightweight library of building blocks for cryptography, \
+highly-optimized for various Intel® CPUs."
+HOMEPAGE = "https://github.com/intel/ipp-crypto"
+
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://../../../LICENSE;md5=d94a5b4dbbc5c6a0c2ce95ab337df6c4"
+
+IPP_BRANCH = "ipp-crypto_${@'_'.join(d.getVar('PV').rsplit('.')[-3:])}"
+
+SRC_URI = "git://github.com/intel/ipp-crypto;protocol=https;branch=${IPP_BRANCH} \
+           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 = "7d6ac349507258f49d00909df33d5dea4ff77f39"
+
+S = "${WORKDIR}/git/sources/ippcp/crypto_mb"
+
+DEPENDS = "openssl"
+
+inherit cmake pkgconfig
+COMPATIBLE_HOST = '(x86_64).*-linux'
+
+EXTRA_OECMAKE += " -DARCH=intel64"
+EXTRA_OECMAKE += " -DTOOLCHAIN_OPTIONS='${TOOLCHAIN_OPTIONS}'"
diff --git a/recipes-oneapi/crypto/intel-crypto-mb_2021.6.bb b/recipes-oneapi/crypto/intel-crypto-mb_2021.6.bb
deleted file mode 100644
index 960aa17c..00000000
--- a/recipes-oneapi/crypto/intel-crypto-mb_2021.6.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Crypto Multi-buffer Library"
-DESCRIPTION = "Intel® Integrated Performance Primitives (Intel® IPP) Cryptography \
-is a secure, fast and lightweight library of building blocks for cryptography, \
-highly-optimized for various Intel® CPUs."
-HOMEPAGE = "https://github.com/intel/ipp-crypto"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://../../../LICENSE;md5=e787af283468feca985d6b865d27d95b"
-
-SRC_URI = " \
-            git://github.com/intel/ipp-crypto;protocol=https;branch=develop \
-            file://0001-CMakeLists.txt-exclude-host-system-headers.patch;striplevel=4 \
-            file://0002-cmake-exclude-Yocto-build-flags.patch;striplevel=4 \
-            "
-SRCREV = "3ae57715fbc7383ef527cab0b824d736b60fa06d"
-
-S = "${WORKDIR}/git/sources/ippcp/crypto_mb"
-
-DEPENDS = "openssl"
-
-inherit cmake pkgconfig
-COMPATIBLE_HOST = '(x86_64).*-linux'
-
-EXTRA_OECMAKE += " -DARCH=intel64"
-EXTRA_OECMAKE += " -DTOOLCHAIN_OPTIONS='${TOOLCHAIN_OPTIONS}'"
diff --git a/recipes-oneapi/onedpl/onedpl_2021.7.0.bb b/recipes-oneapi/onedpl/onedpl_2022.8.0.bb
index c3533823..7e3f309f 100644
--- a/recipes-oneapi/onedpl/onedpl_2021.7.0.bb
+++ b/recipes-oneapi/onedpl/onedpl_2022.8.0.bb
@@ -6,14 +6,14 @@ performance parallel applications."
 HOMEPAGE = "https://github.com/oneapi-src/oneDPL"
 
 LICENSE  = "Apache-2.0-with-LLVM-exception"
-LIC_FILES_CHKSUM = "file://licensing/LICENSE.txt;md5=2e982d844baa4df1c80de75470e0c5cb \
-                    file://licensing/third-party-programs.txt;md5=74cbe473c3521af32a92f662c44aa6bd"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e982d844baa4df1c80de75470e0c5cb \
+                    file://third-party-programs.txt;md5=409cd5c825a23043b6bb347861d34b35"
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/oneapi-src/oneDPL.git;protocol=https;branch=release/2021.7 \
+SRC_URI = "git://github.com/uxlfoundation/oneDPL.git;protocol=https;branch=release/2022.8.0 \
             "
-SRCREV = "df96969b76f075bd9ce14c303659595c747c7223"
+SRCREV = "89d8d8befd4da2cb52f3724f668d17d7e39d42cf"
 
 do_compile[noexec] = "1"
 do_configure[noexec] = "1"
diff --git a/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2022.0.1-3633.bb b/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
index 81653384..a1762a16 100644
--- a/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2022.0.1-3633.bb
+++ b/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
@@ -7,9 +7,12 @@ LIC_FILES_CHKSUM = "file://${CUSTOM_LICENSES_PATH}/EULA;md5=7bfc91523de2e84e7131
 
 SRC_URI = "file://intel-oneapi-runtime.conf"
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_install() {
     mkdir -p ${D}${sysconfdir}/ld.so.conf.d/
-    install -m 644 ${WORKDIR}/intel-oneapi-runtime.conf ${D}${sysconfdir}/ld.so.conf.d/
+    install -m 644 ${S}/intel-oneapi-runtime.conf ${D}${sysconfdir}/ld.so.conf.d/
 }
 
 pkg_postinst_ontarget:${PN}() {
@@ -17,3 +20,4 @@ if [ x"$D" = "x" ]; then
     if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi
 fi
 }
+BBCLASSEXTEND = "native nativesdk"