gentoo auto-resync : 20:05:2023 - 10:17:50

5 files changed, 0 insertions, 335 deletions

diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 2b48b648da50..7f0a9ce0edbb 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,10 +1,5 @@
-AUX pocl-3.0-cuda.patch 1611 BLAKE2B 6baaac79d0182ac91210c0be40239f7d955b57cb2ae26bd70569d952e4f063a5949ecc88a4b1e6ef2a51fa14a62365e627d5e37b35be5d4b46442beff468243e SHA512 95326a202962cec2d3f53bf7dfdcbe1b47abdd25544444f164e1cd2aa5706766342e062045f645c3e1e0e917ca305563df414304c7161e303c3bd55cb313eb03
-AUX pocl-3.0-fix-version.patch 354 BLAKE2B 8e2b4570c204dc37bb70f20b01838f0c21a6aec57c258a206eb5e82bed69fe01d65f704cfd184c102102fd3a06eb75fb092a2ccfa4d8729192451fa894afc7e9 SHA512 bfe023132ab8080c8539a783586f9c556e7ae4cb8113c3c96b33ac02bd7d4044b36bf13e1556e181af9c12acb4b0e0778af25fd66df1fe6e7ab533c2b68108c4
-AUX pocl-3.0-icd.patch 5679 BLAKE2B 4f9edba1e71afb8c059da8f1adcb59f0ccca1bb33ad0c05eb2d3b27c1e7ea6bfa3a2d60f6e6c83136146275aed35a6501713883dad72011379e0ed4ae64eba74 SHA512 436b7f6e53372f00a8c70bb00229d22d05f24687ba2822f4b26590cbdffe64e8c2909d2f1ab6e0650fe18db7507c6bba9f5bcee1a09ec1fe5b42955ddcb99db7
 AUX pocl-3.1-c++11.patch 861 BLAKE2B eca3f649a1ec22735712354cebfe580b740b7c93e851a806b638e6ea23fe5873824d9032771a59d00546b3e99c765ab9490643c446b6af2c7e068d921f82b741 SHA512 e2caac47e8a8fd5d744be1760dc5256d47b1ebcd7119b287a161ce67be262720ef05ed3a49fa39bd1822f79d2f2f82d57c3bf2261cba6459a11695bcc62b73fd
 AUX pocl-3.1-nodebug.patch 1257 BLAKE2B f7f678d2bfc2190b03a40c1ee4c4f2441455081c9097e85249424e27873452a5bcb5b07ce4bc9b0143841c67c7fac2339ea7b3ba76b237f30290a1b82d30b8e4 SHA512 853e583fe0e8bbda6a69e1ce7d49be064a874efc5d9b2ef554df0e11adc485bca2cb6b3376c08989a111935c428a468594a5fe6a1723aa3ffbf92bcb90c5e2f1
-DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea
 DIST pocl-3.1.tar.gz 1928607 BLAKE2B 7044a96e361426408fabd973987a0d6956693e3c9095769ee94d7dac47a8841d7489933e94acd22451a1c8a2ca83cb8e6948aebe899b23a8a6080ef1b7b37e9c SHA512 40d17e81d715f6897aa1d97fd02834d45227d9d0bd4c70e76d727f9ad4df675c25b7158a862e20e63810182fdad82a3cb1e454668c3a6422a977e59c8325fa0c
-EBUILD pocl-3.0.ebuild 3696 BLAKE2B 98c59a9b97da018288012f627dff1888cce6afd86a0270cdd239df582c3f2a9903d6914b25c8016494c0fc03664cda267a3143c6dfaa0012be9e5ca335738116 SHA512 2128a4e61904b885a5bb805f9a3f60e5bafe403aaf72042e7b69f5eb0659e63f000ab130493f7f744a412e54ec8297b8a85836dbe63354bf9abfa7b8d917caab
 EBUILD pocl-3.1.ebuild 3202 BLAKE2B 9b010b6c6b90fcf99091643d725da9836b673e46cf5c90795d8e3569154ea5c3cb7187f45605eefc995902dff010cd188dc71a71d16a3334acd61c0e9322c797 SHA512 bf167ef520049b54b645c1bc934a7b0b43725c99211829827896be984c19d96cd1aab5cca469dc77079b5ab01305d6ace052cd70330821466e4e05142ffc1719
 MISC metadata.xml 1191 BLAKE2B 62b985abe8c99532cc20302846fe9e05c77bbc993ef38863d44bd754df2bc388e5d094917ad11d1b117e9dfda355e35f5592fc2ede5a3bc8e91939c9e6aef9e3 SHA512 a9cdbff5f2b2e2141c6299137baed08d1e8482f3b976ef494b595f58092761aab66f33e539d236d8b7f1c564d5fa2aac4855447b54bc189f1dd81faf25fc32ec
diff --git a/dev-libs/pocl/files/pocl-3.0-cuda.patch b/dev-libs/pocl/files/pocl-3.0-cuda.patch
deleted file mode 100644
index d6729b0fedce..000000000000
--- a/dev-libs/pocl/files/pocl-3.0-cuda.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/pocl/pocl/pull/1146
-
-From 978afab0ba9f90fbdb39ed4ffc52f8ca46d2bfa9 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 5 Dec 2022 04:17:05 +0000
-Subject: [PATCH] pocl-cuda: fix build with -DPOCL_DEBUG_MESSAGES=OFF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes build failure:
-```
-/var/tmp/portage2/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/cuda/pocl-cuda.c: In function ‘load_or_generate_kernel’:
-/var/tmp/portage2/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/cuda/pocl-cuda.c:981:9: error: ‘pocl_debug_messages_filter’ undeclared (first use in this function)
-  981 |   if (!(pocl_debug_messages_filter & POCL_DEBUG_FLAG_CUDA))
-      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
-```
-
-Bug: https://bugs.gentoo.org/862633
---- a/lib/CL/devices/cuda/pocl-cuda.c
-+++ b/lib/CL/devices/cuda/pocl-cuda.c
-@@ -1093,6 +1093,7 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device,
-   /* TODO: When can we unload the module? */
-   CUmodule module;
- 
-+#ifdef POCL_DEBUG_MESSAGES
-   if (!(pocl_debug_messages_filter & POCL_DEBUG_FLAG_CUDA))
-     {
-       result = cuModuleLoad (&module, ptx_filename);
-@@ -1100,6 +1101,7 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device,
-     }
-   else
-     {
-+#endif
-       struct stat st;
-       stat (ptx_filename, &st);
- 
-@@ -1132,7 +1134,9 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device,
- 
-       free (log);
-       free (buffer);
-+#ifdef POCL_DEBUG_MESSAGES
-     }
-+#endif
- 
-   /* Get kernel function */
-   CUfunction function;
-
diff --git a/dev-libs/pocl/files/pocl-3.0-fix-version.patch b/dev-libs/pocl/files/pocl-3.0-fix-version.patch
deleted file mode 100644
index 8ae428036340..000000000000
--- a/dev-libs/pocl/files/pocl-3.0-fix-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,7 +73,7 @@ endif()
- 
- set(MAJOR_VERSION 3)
- set(MINOR_VERSION 0)
--set(VERSION_SUFFIX_FIXED_TEXT "-rc2")
-+set(VERSION_SUFFIX_FIXED_TEXT "")
- set(VERSION_SUFFIX "${VERSION_SUFFIX_FIXED_TEXT}")
- set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_SUFFIX})
- set(POCL_VERSION_BASE ${VERSION_STRING})
diff --git a/dev-libs/pocl/files/pocl-3.0-icd.patch b/dev-libs/pocl/files/pocl-3.0-icd.patch
deleted file mode 100644
index f64e633e2f53..000000000000
--- a/dev-libs/pocl/files/pocl-3.0-icd.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 408fe60850977ab9c68d174a42ae4a5f3455cab1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 20 Jul 2022 04:59:11 +0000
-Subject: [PATCH] CMake: fix build without ocl-icd
-
-If not using ocl-icd (in this case, I was using dev-libs/opencl-icd-loader),
-OCL_ICD_INCLUDE_DIRS and friends won't be defined and CMake bails out
-with an error:
-```
--- Configuring done
-CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
-Please set them or make sure they are set and tested correctly in the CMake files:
-/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/OCL_ICD_INCLUDE_DIRS
-   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL
-   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL
-/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/OCL_ICD_INCLUDE_DIRS
-   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices
-/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/basic/OCL_ICD_INCLUDE_DIRS
-   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/basic
-/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/pthread/OCL_ICD_INCLUDE_DIRS
-   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/pthread
-/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/topology/OCL_ICD_INCLUDE_DIRS
-   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/topology
-/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/llvmopencl/OCL_ICD_INCLUDE_DIRS
-   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/llvmopencl
-```
-
-This broke in 3ecda3b294d70e4f915ad141d669f4bc1298f606.
-
-To fix, just check if the value is truthy before using (this is enough
-for checking if it's NOTFOUND).
---- a/lib/CL/CMakeLists.txt
-+++ b/lib/CL/CMakeLists.txt
-@@ -179,7 +179,9 @@ endif()
- add_library("pocl_cache" OBJECT "pocl_cache.c")
- harden("pocl_cache")
- 
--target_include_directories("pocl_cache" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+if(${OCL_ICD_INCLUDE_DIRS})
-+  target_include_directories("pocl_cache" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+endif()
- 
- 
- if (ENABLE_LLVM)
-@@ -190,7 +192,9 @@ if (ENABLE_LLVM)
-   add_library("lib_cl_llvm" OBJECT ${LLVM_API_SOURCES})
-   harden("lib_cl_llvm")
- 
--  target_include_directories("lib_cl_llvm" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+  if(${OCL_ICD_INCLUDE_DIRS})
-+    target_include_directories("lib_cl_llvm" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+  endif()
- 
-   list(APPEND LIBPOCL_OBJS "$<TARGET_OBJECTS:llvmpasses>")
-   list(APPEND LIBPOCL_OBJS "$<TARGET_OBJECTS:lib_cl_llvm>")
-@@ -200,7 +204,9 @@ if (ENABLE_LLVM)
- endif()
- 
- if(ENABLE_ICD)
--  add_compile_options(${OCL_ICD_CFLAGS})
-+  if(${OCL_ICD_CFLAGS})
-+    add_compile_options(${OCL_ICD_CFLAGS})
-+  endif()
- endif()
- 
- if(HAVE_LTTNG_UST)
---- a/lib/CL/devices/CMakeLists.txt
-+++ b/lib/CL/devices/CMakeLists.txt
-@@ -28,7 +28,9 @@ if(ENABLE_LOADABLE_DRIVERS)
-   function(add_pocl_device_library name)
-     add_library(${name} SHARED ${ARGN})
-     harden("${name}")
--    target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+    if(${OCL_ICD_INCLUDE_DIRS})
-+      target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+    endif()
-     target_link_libraries(${name} PUBLIC ${POCL_PUBLIC_LINK_LIST} PRIVATE ${POCL_LIBRARY_NAME} ${POCL_PRIVATE_LINK_LIST})
-     set_target_properties(${name} PROPERTIES PREFIX "lib" SUFFIX ".so")
-     install(TARGETS ${name} LIBRARY DESTINATION "${POCL_INSTALL_PRIVATE_LIBDIR}" COMPONENT "lib")
-@@ -38,7 +40,9 @@ else()
- 
-   function(add_pocl_device_library name)
-     add_library(${name} OBJECT ${ARGN})
--    target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+    if(${OCL_ICD_INCLUDE_DIRS})
-+      target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+    endif()
-   endfunction()
- 
- endif()
-@@ -143,7 +147,9 @@ if(MSVC)
-   set_source_files_properties( ${POCL_DEVICES_SOURCES} PROPERTIES LANGUAGE CXX )
- endif(MSVC)
- add_library("pocl-devices" OBJECT ${POCL_DEVICES_SOURCES})
--target_include_directories("pocl-devices" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+if(${OCL_ICD_INCLUDE_DIRS})
-+  target_include_directories("pocl-devices" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+endif()
- set(POCL_DEVICES_OBJS "${POCL_DEVICES_OBJS}"
-     "$<TARGET_OBJECTS:pocl-devices>")
- harden("pocl-devices")
---- a/lib/CL/devices/topology/CMakeLists.txt
-+++ b/lib/CL/devices/topology/CMakeLists.txt
-@@ -30,7 +30,9 @@ endif(MSVC)
- add_library("pocl-devices-topology" OBJECT pocl_topology.c pocl_topology.h)
- harden("pocl-devices-topology")
- 
--target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+if(${OCL_ICD_INCLUDE_DIRS})
-+  target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+endif()
- 
- if(Hwloc_FOUND)
-         target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${Hwloc_INCLUDE_DIRS})
---- a/lib/llvmopencl/CMakeLists.txt
-+++ b/lib/llvmopencl/CMakeLists.txt
-@@ -101,7 +101,9 @@ endif(MSVC)
- add_library("llvmpasses" OBJECT ${LLVMPASSES_SOURCES})
- harden("llvmpasses")
- 
--target_include_directories("llvmpasses" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+if(${OCL_ICD_INCLUDE_DIRS})
-+  target_include_directories("llvmpasses" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
-+endif()
- 
- option(ENABLE_LIBLLVMOPENCL "Build separate libllvmopencl.so for use with 'opt'" OFF)
- if(ENABLE_LIBLLVMOPENCL)
diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild
deleted file mode 100644
index c928fcdac263..000000000000
--- a/dev-libs/pocl/pocl-3.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_AUTODOC=0
-DOCS_BUILDER="sphinx"
-DOCS_DIR="doc/sphinx/source"
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-LLVM_MAX_SLOT=14
-
-inherit cmake llvm python-any-r1 docs
-
-DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
-HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
-SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-# TODO: hsa tce
-IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test"
-# Tests not yet passing, fragile in Portage environment(?)
-RESTRICT="!test? ( test ) test"
-
-# TODO: add dependencies for cuda
-# Note: No := on LLVM because it pulls in Clang
-# see llvm.eclass for why
-CLANG_DEPS="!cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
-	cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )"
-RDEPEND="
-	dev-libs/libltdl
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
-	virtual/opencl
-
-	${CLANG_DEPS}
-	debug? ( dev-util/lttng-ust:= )
-	hwloc? ( sys-apps/hwloc:=[cuda?] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${CLANG_DEPS}
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-icd.patch
-	"${FILESDIR}"/${P}-fix-version.patch
-	"${FILESDIR}"/${P}-cuda.patch
-)
-
-python_check_deps() {
-	python_has_version "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
-}
-
-llvm_check_deps() {
-	local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
-
-	# Clang is used at both build time (executed) and runtime
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
-		has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
-		has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-
-	llvm_pkg_setup
-}
-
-src_configure() {
-	local host_cpu_variants="generic"
-
-	if use amd64 ; then
-		# Use pocl's curated list of CPU variants which should contain a good match for any given amd64 CPU
-		host_cpu_variants="distro"
-	elif use ppc64 ; then
-		# A selection of architectures in which new Altivec / VSX features were added
-		# This attempts to recreate the amd64 "distro" option for ppc64
-		# See discussion in bug #831859
-		host_cpu_variants="pwr10;pwr9;pwr8;pwr7;pwr6;g5;a2;generic"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_HSA=OFF
-
-		-DENABLE_ICD=ON
-		-DPOCL_ICD_ABSOLUTE_PATH=ON
-		-DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
-
-		-DENABLE_IPO=$(usex lto)
-
-		-DENABLE_POCL_BUILDING=ON
-		-DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
-
-		-DSTATIC_LLVM=OFF
-		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
-
-		-DENABLE_ACCEL_DEVICE=$(usex accel)
-		-DENABLE_CONFORMANCE=$(usex conformance)
-		-DENABLE_CUDA=$(usex cuda)
-		-DENABLE_HWLOC=$(usex hwloc)
-		-DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
-		-DHARDENING_ENABLE=$(usex hardening)
-		-DPOCL_DEBUG_MESSAGES=$(usex debug)
-		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-src_test() {
-	export POCL_BUILDING=1
-	export POCL_DEVICES=basic
-	export CTEST_OUTPUT_ON_FAILURE=1
-	export TEST_VERBOSE=1
-
-	# Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
-	# But couldn't seem to get tests working yet
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc CREDITS README CHANGES
-
-	if use doc; then
-		dodoc -r _build/html
-		docompress -x /usr/share/doc/${P}/html
-	fi
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${P}/examples
-	fi
-}