From c915adf64c1415679bfe6b55c95348db2f89202e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Jul 2022 08:41:03 +0100 Subject: gentoo auto-resync : 20:07:2022 - 08:41:03 --- dev-libs/pocl/Manifest | 6 +- dev-libs/pocl/files/pocl-3.0-fix-version.patch | 11 ++ dev-libs/pocl/files/pocl-3.0-icd.patch | 127 ++++++++++++++++++++++ dev-libs/pocl/metadata.xml | 1 + dev-libs/pocl/pocl-3.0.ebuild | 143 +++++++++++++++++++++++++ 5 files changed, 287 insertions(+), 1 deletion(-) create mode 100644 dev-libs/pocl/files/pocl-3.0-fix-version.patch create mode 100644 dev-libs/pocl/files/pocl-3.0-icd.patch create mode 100644 dev-libs/pocl/pocl-3.0.ebuild (limited to 'dev-libs/pocl') diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest index 862179626371..4eeb32150ed9 100644 --- a/dev-libs/pocl/Manifest +++ b/dev-libs/pocl/Manifest @@ -1,4 +1,8 @@ +AUX pocl-3.0-fix-version.patch 354 BLAKE2B 8e2b4570c204dc37bb70f20b01838f0c21a6aec57c258a206eb5e82bed69fe01d65f704cfd184c102102fd3a06eb75fb092a2ccfa4d8729192451fa894afc7e9 SHA512 bfe023132ab8080c8539a783586f9c556e7ae4cb8113c3c96b33ac02bd7d4044b36bf13e1556e181af9c12acb4b0e0778af25fd66df1fe6e7ab533c2b68108c4 +AUX pocl-3.0-icd.patch 5679 BLAKE2B 4f9edba1e71afb8c059da8f1adcb59f0ccca1bb33ad0c05eb2d3b27c1e7ea6bfa3a2d60f6e6c83136146275aed35a6501713883dad72011379e0ed4ae64eba74 SHA512 436b7f6e53372f00a8c70bb00229d22d05f24687ba2822f4b26590cbdffe64e8c2909d2f1ab6e0650fe18db7507c6bba9f5bcee1a09ec1fe5b42955ddcb99db7 AUX vendor_opencl_libs_location.patch 962 BLAKE2B 6d0e3f070fa2022d95d35fb1563f72f5dc1b544c7f83417dbb5e3d100dad07bdf3365a48ee92e856de4edc4b7c25674b45efd6d0ace1ac559273641ca175a269 SHA512 2ae144e7590049cc1eac8fa30e360cd511331abba0dfe683867d6a089742ea12cc3bc48dafe41a1c1c9b891fdf35aaac8b14cc1e10a78d2ab49b5e14635bb258 DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d +DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea EBUILD pocl-1.8-r2.ebuild 3121 BLAKE2B 23434ed062197c4e656febf58cb286deb8e14b3f98eb99c4b624d09545117203171378b954fa25557313b1fc22288aa4fde435b3d4e900aad83e499b2bf27469 SHA512 68a4ae0feb2e6e3e87b25ce8ef7064ec428bb1fd4fbffd2dc6b78dd79e6146b31b617c6ff1fa2e9236e6c38ce5c472a585d2178be30202efe348c9ba2a2f70f0 -MISC metadata.xml 1199 BLAKE2B 90d31048bcc33a76837977547ba818b2d2a268c408e7ad40eb157864d7c561d0bbc8ad40a013e28c74092f27f7fc3d23ae52322a2ca2d681c109ace154e29214 SHA512 98341aa0795cf9439ed4c0b8e2575657eaa5898e21b64d7d73592badac0b2a82fe061005a6adcf4e9d3318a4f20b80c62bd379f587dd4fcf993a95017f8ce867 +EBUILD pocl-3.0.ebuild 3656 BLAKE2B 17cb07719ab059d2d0d7081453e751a754e1b962d3105876c5b474b79887a000f03934d93317c5dc2641ba8bae82bb333ea2d7b142c0402b27264bf8efd952ed SHA512 8e980fcba437b88a665e89662394a2fc2fcd512af4e1e544aa7e38f4664cc327ae45d053b1e1b26fe206486656787cb5decc360d07f0c70ce8aa3878aaa3c67e +MISC metadata.xml 1265 BLAKE2B 857cd7ad6dae95355a8102678be5ac4628eecc4b3135ed910b06e9bb5cb5df4473ba6228cd54908717ec87386e7ae41322e8546403648f5d90cd1db57eec8861 SHA512 800fdb1d3c430cd4c4cf3a9792297708cf7779863da2e477327d0bc21c2f4ed83b599f1b703efa31b144140cd2c657a18fc76ce0a7dc5db51e7e27f202ac0e0b diff --git a/dev-libs/pocl/files/pocl-3.0-fix-version.patch b/dev-libs/pocl/files/pocl-3.0-fix-version.patch new file mode 100644 index 000000000000..8ae428036340 --- /dev/null +++ b/dev-libs/pocl/files/pocl-3.0-fix-version.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..f64e633e2f53 --- /dev/null +++ b/dev-libs/pocl/files/pocl-3.0-icd.patch @@ -0,0 +1,127 @@ +From 408fe60850977ab9c68d174a42ae4a5f3455cab1 Mon Sep 17 00:00:00 2001 +From: Sam James +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 "$") + list(APPEND LIBPOCL_OBJS "$") +@@ -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}" + "$") + 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/metadata.xml b/dev-libs/pocl/metadata.xml index 1e1a7087abb5..9e73154528e9 100644 --- a/dev-libs/pocl/metadata.xml +++ b/dev-libs/pocl/metadata.xml @@ -14,6 +14,7 @@ Enable hwloc support Enables custom memory manager. Except for special circumstances, this should be disabled + Adds support for link time optimization pocl/pocl diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild new file mode 100644 index 000000000000..629cf11a51ed --- /dev/null +++ b/dev-libs/pocl/pocl-3.0.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2022 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_{8..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" +# 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? (