2 files changed, 45 insertions, 3 deletions

diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
new file mode 100644
index 00000000..eae129c7
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
@@ -0,0 +1,32 @@
+From d6c5bf050f3d50ca02866ec90e474ef540df2ffa Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Wed, 27 May 2020 11:12:09 +0000
+Subject: [PATCH] intel-compute-runtime: allow to find cpp_generation_tool
+
+Build not able to locate cpp_generation_tool.
+
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ shared/source/built_ins/kernels/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt
+index 308a6cb3b..9f34359c3 100644
+--- a/shared/source/built_ins/kernels/CMakeLists.txt
++++ b/shared/source/built_ins/kernels/CMakeLists.txt
+@@ -84,9 +84,9 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options)
+   )
+   add_custom_command(
+     OUTPUT ${OUTPUT_FILE_CPP}
+-    COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${OUTPUTPATH_BASE}.gen --output ${OUTPUT_FILE_CPP} --array ${BASENAME} --platform ${family_name_with_type}
++    COMMAND cpp_generate_tool --file ${OUTPUTPATH_BASE}.gen --output ${OUTPUT_FILE_CPP} --array ${BASENAME} --platform ${family_name_with_type}
+     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-    DEPENDS ${OUTPUTPATH_BASE}.gen $<TARGET_FILE:cpp_generate_tool>
++    DEPENDS ${OUTPUTPATH_BASE}.gen cpp_generate_tool
+   )
+ endfunction()
+ 
+-- 
+2.24.1
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.20.16837.bb
index 5525b66a..102b91fd 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.20.16837.bb
@@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae27f47fd6755510247c19e547e4c804 \
 
 SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \
            "
+SRC_URI_append_class-target = " file://allow-to-find-cpp-generation-tool.patch"
 
-SRCREV = "e0633548a9bd025c70bc7f3539eef094b1bc9ce1"
+SRCREV = "b9b34659c8817393dd8ce35bf37c167c23cefcff"
 
 S = "${WORKDIR}/git"
 
@@ -30,12 +31,21 @@ EXTRA_OECMAKE = " \
                  -DBUILD_TYPE=Release \
                  -DSKIP_UNIT_TESTS=1 \
                  -DCCACHE_ALLOWED=FALSE \
-                 -Dcloc_cmd_prefix=ocloc \
                  "
+EXTRA_OECMAKE_append_class-target = " \
+                                     -Dcloc_cmd_prefix=ocloc \
+                                    "
+do_install_append_class-native() {
+    install -d ${D}${bindir}
+    install ${B}/bin/cpp_generate_tool ${D}${bindir}/
+}
+
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
 
 FILES_${PN} += " \
                  ${libdir}/intel-opencl/libigdrcl.so \
-                 ${libdir}/intel-opencl/libocloc.so \
+                 ${libdir}/libocloc.so \
                  "
 
 BBCLASSEXTEND = "native nativesdk"