diff --git a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics/0001-Use-standard-installation-directory-variables.patch b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics/0001-Use-standard-installation-directory-variables.patch deleted file mode 100644 index 35469a1c..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics/0001-Use-standard-installation-directory-variables.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 33f60fe2c64272cf1472aa541bcb491a62f81ca5 Mon Sep 17 00:00:00 2001 -From: Naveen Saini -Date: Mon, 26 Oct 2020 16:24:09 +0800 -Subject: [PATCH] Use standard installation directory variables - -Upstream-Status: Submitted [https://github.com/intel/vc-intrinsics/pull/35] - -Signed-off-by: Naveen Saini ---- - GenXIntrinsics/CMakeLists.txt | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/GenXIntrinsics/CMakeLists.txt b/GenXIntrinsics/CMakeLists.txt -index c59c589..5bcf0d1 100644 ---- a/GenXIntrinsics/CMakeLists.txt -+++ b/GenXIntrinsics/CMakeLists.txt -@@ -33,7 +33,7 @@ endif() - # this option is to switch on install when we are building not inside IGC - if(INSTALL_REQUIRED) - install(DIRECTORY include/llvm -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT genx-intrinsics-headers - FILES_MATCHING - PATTERN "*.h" -@@ -43,7 +43,7 @@ if(INSTALL_REQUIRED) - # and then "install(DIRECTORY" installs them even if they are empty - # so generated file has to be installed separetely - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/llvm/GenXIntrinsics/${GENX_INTRINSICS_DESCRIPTION} -- DESTINATION include/llvm/GenXIntrinsics -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm/GenXIntrinsics - COMPONENT genx-intrinsics-headers - ) - -@@ -52,15 +52,15 @@ if(INSTALL_REQUIRED) - # we need to limit it to external build - if(BUILD_EXTERNAL) - install(TARGETS LLVMGenXIntrinsics EXPORT LLVMGenXIntrinsicsTargets -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -- RUNTIME DESTINATION bin -- INCLUDES DESTINATION include -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) - - install(EXPORT LLVMGenXIntrinsicsTargets - FILE LLVMGenXIntrinsicsConfig.cmake -- DESTINATION lib/cmake/LLVMGenXIntrinsics -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LLVMGenXIntrinsics - ) - endif() # BUILD_EXTERNAL - endif() # INSTALL_REQUIRED --- -2.17.1 - diff --git a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb index 39bf5803..eca1cb4d 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb @@ -7,10 +7,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://License.md;md5=c18ea6bb4786a26bf4eee88a7424a408" SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https; \ - file://0001-Use-standard-installation-directory-variables.patch \ " - -SRCREV = "c8c52b5fb14b33e32de9df573b7de186a0c97c94" +SRCREV = "77974f5a32e19475125531483bede9ee23935257" S = "${WORKDIR}/git"