diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2020-10-27 09:51:09 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-10-28 10:38:52 +0800 |
commit | 006ab3bb4c10788342a457da35c7c49ca3843076 (patch) | |
tree | 1385f660b0d3e252967fffc7ba7bce95f43b63a6 /dynamic-layers | |
parent | a30cb23e853a487e65aa043b38a377e8274d8802 (diff) | |
download | meta-intel-006ab3bb4c10788342a457da35c7c49ca3843076.tar.gz |
vc-intrinsics: fix build with mulitlib
Fixes errors seen when multilib is turned on
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers')
2 files changed, 59 insertions, 0 deletions
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 new file mode 100644 index 00000000..35469a1c --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics/0001-Use-standard-installation-directory-variables.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From 33f60fe2c64272cf1472aa541bcb491a62f81ca5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Mon, 26 Oct 2020 16:24:09 +0800 | ||
4 | Subject: [PATCH] Use standard installation directory variables | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/intel/vc-intrinsics/pull/35] | ||
7 | |||
8 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
9 | --- | ||
10 | GenXIntrinsics/CMakeLists.txt | 14 +++++++------- | ||
11 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
12 | |||
13 | diff --git a/GenXIntrinsics/CMakeLists.txt b/GenXIntrinsics/CMakeLists.txt | ||
14 | index c59c589..5bcf0d1 100644 | ||
15 | --- a/GenXIntrinsics/CMakeLists.txt | ||
16 | +++ b/GenXIntrinsics/CMakeLists.txt | ||
17 | @@ -33,7 +33,7 @@ endif() | ||
18 | # this option is to switch on install when we are building not inside IGC | ||
19 | if(INSTALL_REQUIRED) | ||
20 | install(DIRECTORY include/llvm | ||
21 | - DESTINATION include | ||
22 | + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} | ||
23 | COMPONENT genx-intrinsics-headers | ||
24 | FILES_MATCHING | ||
25 | PATTERN "*.h" | ||
26 | @@ -43,7 +43,7 @@ if(INSTALL_REQUIRED) | ||
27 | # and then "install(DIRECTORY" installs them even if they are empty | ||
28 | # so generated file has to be installed separetely | ||
29 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/llvm/GenXIntrinsics/${GENX_INTRINSICS_DESCRIPTION} | ||
30 | - DESTINATION include/llvm/GenXIntrinsics | ||
31 | + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm/GenXIntrinsics | ||
32 | COMPONENT genx-intrinsics-headers | ||
33 | ) | ||
34 | |||
35 | @@ -52,15 +52,15 @@ if(INSTALL_REQUIRED) | ||
36 | # we need to limit it to external build | ||
37 | if(BUILD_EXTERNAL) | ||
38 | install(TARGETS LLVMGenXIntrinsics EXPORT LLVMGenXIntrinsicsTargets | ||
39 | - LIBRARY DESTINATION lib | ||
40 | - ARCHIVE DESTINATION lib | ||
41 | - RUNTIME DESTINATION bin | ||
42 | - INCLUDES DESTINATION include | ||
43 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
44 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
45 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
46 | + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} | ||
47 | ) | ||
48 | |||
49 | install(EXPORT LLVMGenXIntrinsicsTargets | ||
50 | FILE LLVMGenXIntrinsicsConfig.cmake | ||
51 | - DESTINATION lib/cmake/LLVMGenXIntrinsics | ||
52 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LLVMGenXIntrinsics | ||
53 | ) | ||
54 | endif() # BUILD_EXTERNAL | ||
55 | endif() # INSTALL_REQUIRED | ||
56 | -- | ||
57 | 2.17.1 | ||
58 | |||
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 806189b0..39bf5803 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,6 +7,7 @@ LICENSE = "MIT" | |||
7 | LIC_FILES_CHKSUM = "file://License.md;md5=c18ea6bb4786a26bf4eee88a7424a408" | 7 | LIC_FILES_CHKSUM = "file://License.md;md5=c18ea6bb4786a26bf4eee88a7424a408" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https; \ | 9 | SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https; \ |
10 | file://0001-Use-standard-installation-directory-variables.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRCREV = "c8c52b5fb14b33e32de9df573b7de186a0c97c94" | 13 | SRCREV = "c8c52b5fb14b33e32de9df573b7de186a0c97c94" |