diff mbox series

[meta-oe] opencl-cts: update to release 2026-05-05

Message ID 20260608225132.4012664-1-reatmon@ti.com
State Under Review
Headers show
Series [meta-oe] opencl-cts: update to release 2026-05-05 | expand

Commit Message

Ryan Eatmon June 8, 2026, 10:51 p.m. UTC 
Update OpenCL CTS to the latest release.  With the move of the
opencl-headers and other opencl-* packages to a newer version, this one
also needs to update to fix compile issues related to the header
changes.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../files/0001-Ignore-Compiler-Warnings.patch | 43 -------------------
 ...2025.04.14.bb => opencl-cts_2026.05.05.bb} |  9 ++--
 2 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch
 rename meta-oe/recipes-core/opencl/{opencl-cts_2025.04.14.bb => opencl-cts_2026.05.05.bb} (80%)

Comments

Dmitry Baryshkov June 9, 2026, 10:10 a.m. UTC | #1 
On Mon, Jun 08, 2026 at 05:51:32PM -0500, Ryan Eatmon wrote:
> Update OpenCL CTS to the latest release.  With the move of the
> opencl-headers and other opencl-* packages to a newer version, this one
> also needs to update to fix compile issues related to the header
> changes.

Either this, or backport a simple patch.  But yes, I was surprisedto see
OpenCL headers update landing, which broke CTS.

Khem, how was it possible that the landed changes break the layer itself?

> 
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>  .../files/0001-Ignore-Compiler-Warnings.patch | 43 -------------------
>  ...2025.04.14.bb => opencl-cts_2026.05.05.bb} |  9 ++--
>  2 files changed, 4 insertions(+), 48 deletions(-)
>  delete mode 100644 meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch
>  rename meta-oe/recipes-core/opencl/{opencl-cts_2025.04.14.bb => opencl-cts_2026.05.05.bb} (80%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch b/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch
deleted file mode 100644
index 2495f195c1..0000000000
--- a/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-From 082ce10dd191f036f5a6e1fb31134e9736ba3643 Mon Sep 17 00:00:00 2001
-From: Antonios Christidis <a-christidis@ti.com>
-Date: Fri, 17 Jan 2025 15:05:39 -0600
-Subject: [PATCH] Create CMake option ENABLE_WERROR
-
-This creates an option that can be toggled on or off when configuring the project.
-By default, it's set to ON
-
-Upstream-Status: Pending
-Signed-off-by: Antonios Christidis <a-christidis@ti.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,6 +19,16 @@ add_definitions(-DCL_USE_DEPRECATED_OPEN
- add_definitions(-DCL_NO_EXTENSION_PROTOTYPES)
- add_definitions(-DCL_ENABLE_BETA_EXTENSIONS)
- 
-+option(ENABLE_WERROR "Enable warnings as errors" ON)
-+
-+if(ENABLE_WERROR)
-+  if(MSVC)
-+    add_compile_options(/WX)
-+  else()
-+    add_compile_options(-Werror)
-+  endif()
-+endif()
-+
- option(USE_CL_EXPERIMENTAL "Use Experimental definitions" OFF)
- if(USE_CL_EXPERIMENTAL)
-   add_definitions(-DCL_EXPERIMENTAL)
-@@ -99,7 +109,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C
-     add_cxx_flag_if_supported(-Wmisleading-indentation)
-     add_cxx_flag_if_supported(-Wunused-function)
-     add_cxx_flag_if_supported(-Wunused-variable)
--    add_cxx_flag_if_supported(-Werror)
-     if(NOT CMAKE_BUILD_TYPE MATCHES "Release|RelWithDebInfo|MinSizeRel")
-         # Enable more warnings if not doing a release build.
-         add_cxx_flag_if_supported(-Wall)
diff --git a/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb b/meta-oe/recipes-core/opencl/opencl-cts_2026.05.05.bb
similarity index 80%
rename from meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb
rename to meta-oe/recipes-core/opencl/opencl-cts_2026.05.05.bb
index fe1d6075e2..e99c305d9a 100644
--- a/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb
+++ b/meta-oe/recipes-core/opencl/opencl-cts_2026.05.05.bb
@@ -7,16 +7,15 @@  inherit pkgconfig cmake features_check
 
 REQUIRED_DISTRO_FEATURES = "opencl"
 
-DEPENDS += "opencl-headers virtual/libopencl1 spirv-tools-native"
+DEPENDS += "opencl-headers virtual/libopencl1 spirv-headers spirv-tools-native"
 RDEPENDS:${PN} += "python3-core python3-io"
 
 
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-CTS.git;protocol=https;branch=main;lfs=0 \
-	   file://0001-Ignore-Compiler-Warnings.patch"
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-CTS.git;protocol=https;branch=main;lfs=0"
 
-SRCREV = "e96edaef8b582c2412a2aab4b82f5c88af88617d"
+SRCREV = "0979549a997090c0569da4c4e995422b8f73f1fe"
 
-EXTRA_OECMAKE:append = " -DENABLE_WERROR=OFF -DCL_INCLUDE_DIR=${STAGING_INCDIR} -DCL_LIB_DIR=${STAGING_LIBDIR} -DOPENCL_LIBRARIES=OpenCL"
+EXTRA_OECMAKE:append = " --compile-no-warning-as-error -DSPIRV_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} -DCL_INCLUDE_DIR=${STAGING_INCDIR} -DCL_LIB_DIR=${STAGING_LIBDIR} -DOPENCL_LIBRARIES=OpenCL"
 
 PACKAGECONFIG = " \
 	${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl gles', '', d)} \