* [gentoo-commits] proj/sci:master commit in: sys-devel/DPC++/, sys-devel/DPC++/files/
@ 2023-02-25 9:35 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2023-02-25 9:35 UTC (permalink / raw
To: gentoo-commits
commit: b784b5a486fb3e44d5068319df822874071d49dc
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 09:35:19 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 09:35:29 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b784b5a4
sys-devel/DPC++: add 2022.12
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-devel/DPC++/DPC++-2022.12.ebuild | 183 ++++++++++++++
.../DPC++/files/DPC++-2022.12-system-libs.patch | 273 +++++++++++++++++++++
2 files changed, 456 insertions(+)
diff --git a/sys-devel/DPC++/DPC++-2022.12.ebuild b/sys-devel/DPC++/DPC++-2022.12.ebuild
new file mode 100644
index 000000000..14e9e0ea0
--- /dev/null
+++ b/sys-devel/DPC++/DPC++-2022.12.ebuild
@@ -0,0 +1,183 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit cmake python-any-r1
+DOCS_BUILDER="doxygen"
+DOCS_DIR="build/docs"
+DOCS_CONFIG_NAME="doxygen.cfg"
+DOCS_DEPEND="
+ media-gfx/graphviz
+ virtual/latex-base
+ $(python_gen_any_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/recommonmark[${PYTHON_USEDEP}]
+ dev-python/myst_parser[${PYTHON_USEDEP}]
+ ')
+"
+inherit docs
+
+# We cannot unbundle this because it has to be compiled with the clang/llvm
+# that we are building here. Otherwise we run into problems running the compiler.
+CPU_EMUL_PV="2022-08-22"
+VC_INTR_PV="0.10.0" # Newer versions cause compile failure
+UR_COMMIT="fd711c920acc4434cb52ff18b078c082d9d7f44d"
+
+DESCRIPTION="oneAPI Data Parallel C++ compiler"
+HOMEPAGE="https://github.com/intel/llvm"
+SRC_URI="
+ https://github.com/intel/llvm/archive/refs/tags/${PV//./-}.tar.gz -> ${P}.tar.gz
+ https://github.com/intel/vc-intrinsics/archive/refs/tags/v${VC_INTR_PV}.tar.gz -> ${P}-vc-intrinsics-${VC_INTR_PV}.tar.gz
+ https://github.com/oneapi-src/unified-runtime/archive/${UR_COMMIT}.tar.gz -> ${P}-unified-runtime-${UR_COMMIT}.tar.gz
+ esimd_emulator? ( https://github.com/intel/cm-cpu-emulation/archive/refs/tags/v${CPU_EMUL_PV}.tar.gz -> ${P}-cm-cpu-emulation-${CPU_EMUL_PV}.tar.gz )
+"
+S="${WORKDIR}/llvm-${PV//./-}"
+CMAKE_USE_DIR="${S}/llvm"
+BUILD_DIR="${S}/build"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/6" # Based on libsycl.so
+KEYWORDS="~amd64"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+IUSE="cuda hip test esimd_emulator ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="
+ ?? ( cuda hip )
+ cuda? ( llvm_targets_NVPTX )
+ hip? ( llvm_targets_AMDGPU )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="
+ dev-libs/boost:=
+ dev-libs/level-zero:=
+ dev-libs/opencl-icd-loader
+ dev-util/opencl-headers
+ dev-util/spirv-headers
+ dev-util/spirv-tools
+ media-libs/libva
+ sys-devel/libtool
+ esimd_emulator? ( dev-libs/libffi:= )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ hip? ( dev-util/hip:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-system-libs.patch"
+)
+
+src_configure() {
+ # Extracted from buildbot/configure.py
+ local mycmakeargs=(
+ -DLLVM_ENABLE_ASSERTIONS=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_EXTERNAL_PROJECTS="sycl;llvm-spirv;opencl;libdevice;xpti;xptifw"
+ -DLLVM_EXTERNAL_SYCL_SOURCE_DIR="${S}/sycl"
+ -DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR="${S}/llvm-spirv"
+ -DLLVM_EXTERNAL_XPTI_SOURCE_DIR="${S}/xpti"
+ -DXPTI_SOURCE_DIR="${S}/xpti"
+ -DLLVM_EXTERNAL_XPTIFW_SOURCE_DIR="${S}/xptifw"
+ -DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR="${S}/libdevice"
+ -DLLVM_ENABLE_PROJECTS="clang;sycl;llvm-spirv;opencl;libdevice;xpti;xptifw"
+ -DLLVM_BUILD_TOOLS=ON
+ -DSYCL_ENABLE_WERROR=OFF
+ -DSYCL_INCLUDE_TESTS="$(usex test)"
+ -DCLANG_INCLUDE_TESTS="$(usex test)"
+ -DLLVM_INCLUDE_TESTS="$(usex test)"
+ -DLLVM_SPIRV_INCLUDE_TESTS="$(usex test)"
+ -DLLVM_ENABLE_DOXYGEN="$(usex doc)"
+ -DLLVM_ENABLE_SPHINX="$(usex doc)"
+ -DLLVM_BUILD_DOCS="$(usex doc)"
+ -DSYCL_ENABLE_XPTI_TRACING=ON
+ -DLLVM_ENABLE_LLD=OFF
+ -DXPTI_ENABLE_WERROR=OFF
+ -DSYCL_ENABLE_PLUGINS="level_zero;opencl;$(usev esimd_emulator);$(usev hip);$(usev cuda)"
+ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr"
+ -DBOOST_MP11_SOURCE_DIR="${ESYSROOT}/usr "
+ -DLEVEL_ZERO_LIBRARY="${ESYSROOT}/usr/lib64/libze_loader.so"
+ -DLEVEL_ZERO_INCLUDE_DIR="${ESYSROOT}/usr/include"
+ -DLLVMGenXIntrinsics_SOURCE_DIR="${WORKDIR}/vc-intrinsics-${VC_INTR_PV}"
+ -DSYCL_CLANG_EXTRA_FLAGS="${CXXFLAGS}"
+ -DUNIFIED_RUNTIME_SOURCE_DIR="${WORKDIR}/unified-runtime-${UR_COMMIT}"
+ # The sycl part of the build system insists on installing during compiling
+ # Install it to some temporary directory
+ -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}/install"
+ -DCMAKE_INSTALL_MANDIR="${BUILD_DIR}/install/share/man"
+ -DCMAKE_INSTALL_INFODIR="${BUILD_DIR}/install/share/info"
+ -DCMAKE_INSTALL_DOCDIR="${BUILD_DIR}/install/share/doc/${PF}"
+ )
+
+ if use hip; then
+ mycmakeargs+=(
+ -DSYCL_BUILD_PI_HIP_PLATFORM=AMD
+ -DLIBCLC_GENERATE_REMANGLED_VARIANTS=ON
+ -DLIBCLC_TARGETS_TO_BUILD=";amdgcn--;amdgcn--amdhsa"
+ )
+ fi
+
+ if use cuda; then
+ mycmakeargs+=(
+ -DLIBCLC_GENERATE_REMANGLED_VARIANTS=ON
+ -DLIBCLC_TARGETS_TO_BUILD=";nvptx64--;nvptx64--nvidiacl"
+ )
+ fi
+
+ if use esimd_emulator; then
+ mycmakeargs+=(
+ -DLibFFI_INCLUDE_DIR="${ESYSROOT}/usr/lib64/libffi/include"
+ -DUSE_LOCAL_CM_EMU_SOURCE="${WORKDIR}/cm-cpu-emulation-${CPU_EMUL_PV}"
+ )
+ fi
+
+ if use doc; then
+ mycmakeargs+=( -DSPHINX_WARNINGS_AS_ERRORS=OFF )
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ # Build sycl (this also installs some stuff already)
+ cmake_build deploy-sycl-toolchain
+
+ use doc && cmake_build doxygen-sycl
+
+ # Install all other files into the same temporary directory
+ cmake_build install
+}
+
+src_test() {
+ cmake_build check
+}
+
+src_install() {
+ einstalldocs
+
+ local LLVM_INTEL_DIR="/usr/lib/llvm/intel"
+ dodir "${LLVM_INTEL_DIR}"
+
+ # Copy our temporary directory to the image directory
+ mv "${BUILD_DIR}/install"/* "${ED}/${LLVM_INTEL_DIR}" || die
+
+ # Convienence symlinks
+ dosym "${LLVM_INTEL_DIR}/bin/clang" "/usr/bin/icx"
+ dosym "${LLVM_INTEL_DIR}/bin/clang++" "/usr/bin/icpx"
+
+ # Copied from llvm ebuild, put env file last so we don't overwrite main llvm/clang
+ newenvd - "60llvm-intel" <<-_EOF_
+ PATH="${EPREFIX}${LLVM_INTEL_DIR}/bin"
+ # we need to duplicate it in ROOTPATH for Portage to respect...
+ ROOTPATH="${EPREFIX}${LLVM_INTEL_DIR}/bin"
+ MANPATH="${EPREFIX}${LLVM_INTEL_DIR}/share/man"
+ LDPATH="${EPREFIX}${LLVM_INTEL_DIR}/lib:${EPREFIX}${LLVM_INTEL_DIR}/lib64"
+ _EOF_
+}
diff --git a/sys-devel/DPC++/files/DPC++-2022.12-system-libs.patch b/sys-devel/DPC++/files/DPC++-2022.12-system-libs.patch
new file mode 100644
index 000000000..c5d9d138b
--- /dev/null
+++ b/sys-devel/DPC++/files/DPC++-2022.12-system-libs.patch
@@ -0,0 +1,273 @@
+diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt
+index 954317fe2..ba3bf19d3 100644
+--- a/opencl/CMakeLists.txt
++++ b/opencl/CMakeLists.txt
+@@ -23,29 +23,8 @@ set(OCL_LOADER_REPO
+ set(OCL_HEADERS_TAG dcd5bede6859d26833cd85f0d6bbcee7382dc9b3)
+ set(OCL_LOADER_TAG 792682ad3d877ab38573b997808bab3b43902b70)
+
+-# OpenCL Headers
+-if(NOT OpenCL_HEADERS)
+- message(STATUS "Will fetch OpenCL headers from ${OCL_HEADERS_REPO}")
+-
+- FetchContent_Declare(ocl-headers
+- GIT_REPOSITORY ${OCL_HEADERS_REPO}
+- GIT_TAG ${OCL_HEADERS_TAG}
+- )
+-else()
+- message(STATUS "OpenCL headers are added manually ${OpenCL_HEADERS}")
+-
+- FetchContent_Declare(ocl-headers
+- URL ${OpenCL_HEADERS}
+- )
+-endif()
+-
+-FetchContent_MakeAvailable(ocl-headers)
+-FetchContent_GetProperties(ocl-headers)
+ set(OpenCL_INCLUDE_DIR
+- ${ocl-headers_SOURCE_DIR} CACHE PATH "Path to OpenCL Headers")
+-
+-target_compile_definitions(Headers INTERFACE -DCL_TARGET_OPENCL_VERSION=220)
+-add_library(OpenCL-Headers ALIAS Headers)
++ /usr/include CACHE PATH "Path to OpenCL Headers")
+
+ # OpenCL Library (ICD Loader)
+
+@@ -57,25 +36,4 @@ set(OPENCL_ICD_LOADER_HEADERS_DIR
+ # library.
+ set(BUILD_SHARED_LIBS ON)
+
+-if(NOT OpenCL_LIBRARY_SRC)
+- message(STATUS "Will fetch OpenCL ICD Loader from ${OCL_LOADER_REPO}")
+-
+- FetchContent_Declare(ocl-icd
+- GIT_REPOSITORY ${OCL_LOADER_REPO}
+- GIT_TAG ${OCL_LOADER_TAG}
+- )
+-else()
+- # TODO: add possibility to use prebuilt OpenCL library rather than building
+- # together with llvm.
+- message(STATUS
+- "OpenCL ICD Loader sources added manually ${OpenCL_LIBRARY_SRC}")
+-
+- FetchContent_Declare(ocl-icd
+- URL ${OpenCL_LIBRARY_SRC}
+- )
+-endif()
+-
+-FetchContent_MakeAvailable(ocl-icd)
+-add_library(OpenCL-ICD ALIAS OpenCL)
+-
+ add_subdirectory(opencl-aot)
+diff --git a/opencl/opencl-aot/CMakeLists.txt b/opencl/opencl-aot/CMakeLists.txt
+index ff905fd88..b673f79a4 100644
+--- a/opencl/opencl-aot/CMakeLists.txt
++++ b/opencl/opencl-aot/CMakeLists.txt
+@@ -19,5 +19,5 @@ endif()
+
+ target_link_libraries(${OPENCL_AOT_PROJECT_NAME}
+ PRIVATE
+- OpenCL-Headers
+- OpenCL-ICD)
++ OpenCL
++)
+diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
+index 86c5b420d..1d834de4f 100644
+--- a/sycl/CMakeLists.txt
++++ b/sycl/CMakeLists.txt
+@@ -142,7 +142,7 @@ file(COPY ${OpenCL_INCLUDE_DIR}/CL
+ # Include OpenCL Headers into final bundle.
+ install(DIRECTORY ${OpenCL_INCLUDE_DIR}/CL
+ DESTINATION ${SYCL_INCLUDE_DIR}/sycl
+- COMPONENT OpenCL-Headers)
++ COMPONENT OpenCL)
+
+ # Option to enable online kernel fusion via a JIT compiler
+ option(SYCL_ENABLE_KERNEL_FUSION "Enable kernel fusion via JIT compiler" OFF)
+@@ -371,7 +371,7 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
+ sycl-post-link
+ sycl-ls
+ clang-resource-headers
+- OpenCL-Headers
++ OpenCL
+ opencl-aot
+ sycl-headers
+ sycl-headers-extras
+@@ -391,9 +391,7 @@ if (TARGET sycl-trace)
+ list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS sycl-trace)
+ endif()
+
+-if(OpenCL_INSTALL_KHRONOS_ICD_LOADER AND TARGET OpenCL-ICD)
+- list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS OpenCL-ICD)
+-endif()
++list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS OpenCL)
+
+ # Build and install lld as part of the sycl-toolchain if available
+ if("lld" IN_LIST LLVM_ENABLE_PROJECTS)
+diff --git a/sycl/cmake/modules/AddSYCL.cmake b/sycl/cmake/modules/AddSYCL.cmake
+index dbf539e9a..5933b9770 100644
+--- a/sycl/cmake/modules/AddSYCL.cmake
++++ b/sycl/cmake/modules/AddSYCL.cmake
+@@ -47,7 +47,7 @@ function(add_sycl_plugin PLUGIN_NAME)
+ ${sycl_inc_dir}
+ LIBRARIES
+ ${ARG_LIBRARIES}
+- OpenCL-Headers
++ OpenCL
+ )
+
+ install(TARGETS pi_${PLUGIN_NAME}
+diff --git a/sycl/cmake/modules/AddSYCLUnitTest.cmake b/sycl/cmake/modules/AddSYCLUnitTest.cmake
+index 9f5e6dc30..fe0e18b2f 100644
+--- a/sycl/cmake/modules/AddSYCLUnitTest.cmake
++++ b/sycl/cmake/modules/AddSYCLUnitTest.cmake
+@@ -53,7 +53,7 @@ macro(add_sycl_unittest test_dirname link_variant)
+ target_link_libraries(${test_dirname}
+ PRIVATE
+ LLVMTestingSupport
+- OpenCL-Headers
++ OpenCL
+ ${SYCL_LINK_LIBS}
+ )
+ target_include_directories(${test_dirname}
+diff --git a/sycl/plugins/esimd_emulator/CMakeLists.txt b/sycl/plugins/esimd_emulator/CMakeLists.txt
+index 0b32c3925..e8b8616bc 100755
+--- a/sycl/plugins/esimd_emulator/CMakeLists.txt
++++ b/sycl/plugins/esimd_emulator/CMakeLists.txt
+@@ -58,6 +58,7 @@ if ((DEFINED USE_DEFAULT_CM_EMU_SOURCE) OR (DEFINED USE_LOCAL_CM_EMU_SOURCE))
+ INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/cm-emu_install
+ CMAKE_ARGS -DLIBVA_INSTALL_PATH=/usr
+ -D__SYCL_EXPLICIT_SIMD_PLUGIN__=true
++ -DLibFFI_INCLUDE_DIR=${LibFFI_INCLUDE_DIR}
+ -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+ BUILD_BYPRODUCTS ${LIBCM} ${LIBIGFXCMRT_EMU}
+ )
+diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt
+index 7b0ce7eae..b9ee52376 100755
+--- a/sycl/plugins/level_zero/CMakeLists.txt
++++ b/sycl/plugins/level_zero/CMakeLists.txt
+@@ -44,7 +44,7 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
+ LOG_BUILD 1
+ LOG_INSTALL 1
+ STEP_TARGETS configure,build,install
+- DEPENDS OpenCL-Headers
++ DEPENDS OpenCL
+ BUILD_BYPRODUCTS ${LEVEL_ZERO_LOADER}
+ )
+ ExternalProject_Add_Step(level-zero-loader llvminstall
+@@ -78,7 +78,7 @@ else()
+ COMMAND
+ ${CMAKE_COMMAND} -E copy ${LEVEL_ZERO_LIBRARY_SRC} ${LLVM_LIBRARY_OUTPUT_INTDIR}
+ COMMAND
+- ${CMAKE_COMMAND} -E copy_directory ${LEVEL_ZERO_INCLUDE_DIR} ${LLVM_BINARY_DIR}/include/sycl
++ ${CMAKE_COMMAND} -E copy_directory ${LEVEL_ZERO_INCLUDE_DIR}/level_zero ${LLVM_BINARY_DIR}/include/sycl/level_zero
+ DEPENDS
+ ${LEVEL_ZERO_LIBRARY}
+ ${LEVEL_ZERO_INCLUDE_DIR}
+diff --git a/sycl/plugins/opencl/CMakeLists.txt b/sycl/plugins/opencl/CMakeLists.txt
+index 9943827e4..29fae166e 100644
+--- a/sycl/plugins/opencl/CMakeLists.txt
++++ b/sycl/plugins/opencl/CMakeLists.txt
+@@ -15,7 +15,7 @@ add_sycl_plugin(opencl
+ "${sycl_inc_dir}/sycl/detail/pi.h"
+ "pi_opencl.cpp"
+ LIBRARIES
+- OpenCL-ICD
++ OpenCL
+ )
+
+ set_target_properties(pi_opencl PROPERTIES LINKER_LANGUAGE CXX)
+diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
+index f442db4a4..9ca733695 100755
+--- a/sycl/plugins/unified_runtime/CMakeLists.txt
++++ b/sycl/plugins/unified_runtime/CMakeLists.txt
+@@ -3,18 +3,6 @@
+
+ include(FetchContent)
+
+-set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
+-set(UNIFIED_RUNTIME_TAG fd711c920acc4434cb52ff18b078c082d9d7f44d)
+-
+-message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
+-FetchContent_Declare(unified-runtime
+- GIT_REPOSITORY ${UNIFIED_RUNTIME_REPO}
+- GIT_TAG ${UNIFIED_RUNTIME_TAG}
+-)
+-
+-FetchContent_MakeAvailable(unified-runtime)
+-FetchContent_GetProperties(unified-runtime)
+-
+ set(UNIFIED_RUNTIME_SOURCE_DIR
+ ${unified-runtime_SOURCE_DIR} CACHE PATH "Path to Unified Runtime Headers")
+ set(UNIFIED_RUNTIME_INCLUDE_DIR "${UNIFIED_RUNTIME_SOURCE_DIR}/include")
+diff --git a/sycl/source/CMakeLists.txt b/sycl/source/CMakeLists.txt
+index c61b10da7..02a7fab32 100644
+--- a/sycl/source/CMakeLists.txt
++++ b/sycl/source/CMakeLists.txt
+@@ -84,7 +84,7 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
+ )
+ #TODO: Remove dependency on opencl headers.
+ target_link_libraries(${LIB_OBJ_NAME}
+- PRIVATE OpenCL-Headers
++ PRIVATE OpenCL
+ )
+
+ find_package(Threads REQUIRED)
+diff --git a/sycl/tools/sycl-ls/CMakeLists.txt b/sycl/tools/sycl-ls/CMakeLists.txt
+index f5909cf49..f9c52e3a3 100644
+--- a/sycl/tools/sycl-ls/CMakeLists.txt
++++ b/sycl/tools/sycl-ls/CMakeLists.txt
+@@ -11,7 +11,7 @@ endif()
+ target_link_libraries(sycl-ls
+ PRIVATE
+ ${sycl_lib}
+- OpenCL-Headers
++ OpenCL
+ )
+ install(TARGETS sycl-ls
+ RUNTIME DESTINATION "bin" COMPONENT sycl-ls)
+diff --git a/sycl/tools/sycl-prof/CMakeLists.txt b/sycl/tools/sycl-prof/CMakeLists.txt
+index 09586c1b8..bc8f37379 100644
+--- a/sycl/tools/sycl-prof/CMakeLists.txt
++++ b/sycl/tools/sycl-prof/CMakeLists.txt
+@@ -15,9 +15,7 @@ target_compile_options(sycl-prof PRIVATE -fno-exceptions -fno-rtti)
+ add_library(sycl_profiler_collector SHARED collector.cpp)
+ target_compile_definitions(sycl_profiler_collector PRIVATE XPTI_CALLBACK_API_EXPORTS)
+ target_link_libraries(sycl_profiler_collector PRIVATE xptifw)
+-if (TARGET OpenCL-Headers)
+- target_link_libraries(sycl_profiler_collector PRIVATE OpenCL-Headers)
+-endif()
++target_link_libraries(sycl_profiler_collector PRIVATE OpenCL)
+ target_include_directories(sycl_profiler_collector PRIVATE
+ "${sycl_inc_dir}"
+ "${sycl_src_dir}"
+diff --git a/sycl/tools/sycl-sanitize/CMakeLists.txt b/sycl/tools/sycl-sanitize/CMakeLists.txt
+index 16e7a1a49..4ef93e8e2 100644
+--- a/sycl/tools/sycl-sanitize/CMakeLists.txt
++++ b/sycl/tools/sycl-sanitize/CMakeLists.txt
+@@ -13,9 +13,7 @@ target_compile_options(sycl-sanitize PRIVATE -fno-exceptions -fno-rtti)
+ add_library(sycl_sanitizer_collector SHARED collector.cpp)
+ target_compile_definitions(sycl_sanitizer_collector PRIVATE XPTI_CALLBACK_API_EXPORTS)
+ target_link_libraries(sycl_sanitizer_collector PRIVATE xptifw)
+-if (TARGET OpenCL-Headers)
+- target_link_libraries(sycl_sanitizer_collector PRIVATE OpenCL-Headers)
+-endif()
++target_link_libraries(sycl_sanitizer_collector PRIVATE OpenCL)
+
+ target_include_directories(sycl_sanitizer_collector PRIVATE
+ "${CMAKE_CURRENT_SOURCE_DIR}/../xpti_helpers/"
+diff --git a/sycl/tools/sycl-trace/CMakeLists.txt b/sycl/tools/sycl-trace/CMakeLists.txt
+index 6f36b83a2..24f0d115b 100644
+--- a/sycl/tools/sycl-trace/CMakeLists.txt
++++ b/sycl/tools/sycl-trace/CMakeLists.txt
+@@ -62,9 +62,7 @@ endif()
+
+ target_compile_definitions(sycl_pi_trace_collector PRIVATE XPTI_CALLBACK_API_EXPORTS)
+ target_link_libraries(sycl_pi_trace_collector PRIVATE xptifw)
+-if (TARGET OpenCL-Headers)
+- target_link_libraries(sycl_pi_trace_collector PRIVATE OpenCL-Headers)
+-endif()
++target_link_libraries(sycl_pi_trace_collector PRIVATE OpenCL)
+
+ target_include_directories(sycl_pi_trace_collector PRIVATE
+ "${CMAKE_CURRENT_SOURCE_DIR}/../xpti_helpers/"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-devel/DPC++/, sys-devel/DPC++/files/
@ 2023-08-22 10:13 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2023-08-22 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 42840069a800346e540ed29895c7b8b43b6fce56
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 08:50:26 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 08:50:26 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=42840069
sys-devel/DPC++: add patch for gcc13
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-devel/DPC++/DPC++-2022.12.ebuild | 1 +
sys-devel/DPC++/files/DPC++-2022.12-gcc13.patch | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/sys-devel/DPC++/DPC++-2022.12.ebuild b/sys-devel/DPC++/DPC++-2022.12.ebuild
index 59e169180..25ac88770 100644
--- a/sys-devel/DPC++/DPC++-2022.12.ebuild
+++ b/sys-devel/DPC++/DPC++-2022.12.ebuild
@@ -73,6 +73,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-system-libs.patch"
+ "${FILESDIR}/${P}-gcc13.patch"
)
src_configure() {
diff --git a/sys-devel/DPC++/files/DPC++-2022.12-gcc13.patch b/sys-devel/DPC++/files/DPC++-2022.12-gcc13.patch
new file mode 100644
index 000000000..047170cd3
--- /dev/null
+++ b/sys-devel/DPC++/files/DPC++-2022.12-gcc13.patch
@@ -0,0 +1,12 @@
+diff --git a/sycl/include/sycl/sycl_span.hpp b/sycl/include/sycl/sycl_span.hpp
+index 33b942fbc..395694573 100644
+--- a/sycl/include/sycl/sycl_span.hpp
++++ b/sycl/include/sycl/sycl_span.hpp
+@@ -128,6 +128,7 @@ template<class Container>
+ #include <cassert> // for assert
+ #include <cstddef> // for byte
+ #include <iterator> // for iterators
++#include <cstdint>
+ #include <type_traits> // for remove_cv, etc
+
+ #define _SYCL_SPAN_TEMPLATE_VIS
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-22 10:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-22 10:13 [gentoo-commits] proj/sci:master commit in: sys-devel/DPC++/, sys-devel/DPC++/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2023-02-25 9:35 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox