Signed-off-by: Naveen Saini <[email protected]>
---
conf/machine/include/meta-intel.inc | 3 --
.../files/point-to-correct-llvm-tblgen.patch | 43 ----------------------
.../recipes-opencl/opencl-clang/opencl-clang.inc | 27 --------------
.../opencl-clang/opencl-clang_10.0.0.bb | 28 +++++++++++++-
.../opencl-clang/opencl-clang_9.0.0.bb | 7 ----
5 files changed, 27 insertions(+), 81 deletions(-)
delete mode 100644
dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch
delete mode 100644
dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
delete mode 100644
dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb
diff --git a/conf/machine/include/meta-intel.inc
b/conf/machine/include/meta-intel.inc
index 8b03272..932c0cc 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -17,9 +17,6 @@ PREFERRED_VERSION_linux-intel-rt ?= "5.4%"
PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%"
PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%"
-PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION',
'9.0.1', '9.0.0', '10.0.0', d)}"
-PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION',
'9.0.1', '9.0.0', '10.0.0', d)}"
-
XSERVER_X86_ASPEED_AST = "xf86-video-ast \
"
diff --git
a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch
b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch
deleted file mode 100644
index 417e022..0000000
---
a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2ce2619b544678541e0cc56494e2927086718613 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <[email protected]>
-Date: Tue, 26 Mar 2019 14:11:29 +0800
-Subject: [PATCH] point to correct llvm-tblgen
-
-Let llvm-tblgen path be passed from recipe itself.
-
-Also since we're going to do the patching ourselves, no need to look for
-git through cmake.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Anuj Mittal <[email protected]>
-Signed-off-by: Naveen Saini <[email protected]>
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1371a67..f83ffcc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,7 @@ endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
- include(AddLLVM)
- include(TableGen)
-
--find_package(Git REQUIRED)
-+#find_package(Git REQUIRED)
-
- if (NOT WIN32)
- add_subdirectory( linux_linker )
-@@ -138,7 +138,7 @@ endif(NOT USE_PREBUILT_LLVM)
- set (COMPILE_OPTIONS_TD opencl_clang_options.td)
- set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
-
--set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+#set(LLVM_TABLEGEN_EXE "llvm-tblgen")
- set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
- if(USE_PREBUILT_LLVM)
- set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})
---
-2.17.1
-
diff --git
a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
deleted file mode 100644
index c099a50..0000000
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Common clang is a thin wrapper library around clang"
-DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \
- to compile OpenCL C kernels to SPIR-V modules."
-
-LICENSE = "NCSA"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-DEPENDS += "clang"
-DEPENDS_append_class-target = " opencl-clang-native"
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST_libc-musl = "null"
-
-EXTRA_OECMAKE += "\
- -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
- -DCMAKE_SKIP_RPATH=TRUE \
- "
-
-do_install_append_class-native() {
- install -d ${D}${bindir}
- install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git
a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb
b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb
index c2b7d74..c5ba96c 100644
---
a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb
+++
b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb
@@ -1,4 +1,9 @@
-require opencl-clang.inc
+SUMMARY = "Common clang is a thin wrapper library around clang"
+DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \
+ to compile OpenCL C kernels to SPIR-V modules."
+
+LICENSE = "NCSA"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c"
SRC_URI =
"git://github.com/intel/opencl-clang.git;branch=ocl-open-100;protocol=https \
file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \
@@ -7,3 +12,24 @@ SRC_URI =
"git://github.com/intel/opencl-clang.git;branch=ocl-open-100;protocol=
SRC_URI_append_class-native = "
file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch"
SRCREV = "92f3f7f1a06f25fb13708f87c26b0fbf50924c96"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+DEPENDS += "clang"
+DEPENDS_append_class-target = " opencl-clang-native"
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST_libc-musl = "null"
+
+EXTRA_OECMAKE += "\
+ -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+ -DCMAKE_SKIP_RPATH=TRUE \
+ "
+
+do_install_append_class-native() {
+ install -d ${D}${bindir}
+ install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git
a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb
b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb
deleted file mode 100644
index f262a5e..0000000
---
a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require opencl-clang.inc
-
-SRC_URI =
"git://github.com/intel/opencl-clang.git;branch=ocl-open-90;protocol=https \
- file://point-to-correct-llvm-tblgen.patch \
- "
-
-SRCREV = "6f8c329bea44321aef1a1716dd206c1f7bed23cf"
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6643):
https://lists.yoctoproject.org/g/meta-intel/message/6643
Mute This Topic: https://lists.yoctoproject.org/mt/75699914/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
