[gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2021-09-23  6:36 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-09-23  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     a47d0fd7fd70bfdf59853f5ae4b34c9d36c9dbca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 23 06:25:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 06:36:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47d0fd7

dev-libs/pocl: various fixups

Mostly fixups I missed when importing from GURU earlier:
- LLVM deps
- General tidying

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../pocl/{pocl-1.7.ebuild => pocl-1.7-r1.ebuild}   | 47 +++++++++++++++-------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/dev-libs/pocl/pocl-1.7.ebuild b/dev-libs/pocl/pocl-1.7-r1.ebuild
similarity index 66%
rename from dev-libs/pocl/pocl-1.7.ebuild
rename to dev-libs/pocl/pocl-1.7-r1.ebuild
index 74100b13bb3..d5f2724b962 100644
--- a/dev-libs/pocl/pocl-1.7.ebuild
+++ b/dev-libs/pocl/pocl-1.7-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 DOCS_AUTODOC=0
 DOCS_BUILDER="sphinx"
@@ -13,10 +13,7 @@ inherit cmake llvm python-any-r1 docs
 LLVM_MAX_SLOT=12
 
 DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
-HOMEPAGE="
-	http://portablecl.org
-	https://github.com/pocl/pocl
-"
+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"
@@ -26,35 +23,51 @@ IUSE="accel cl20 +conformance cuda debug examples float-conversion hardening +hw
 
 RESTRICT="!test? ( test ) mirror"
 
-#TODO: add dependencies for cuda
+# 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}
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1))
 	virtual/opencl
 
-	!cuda? ( sys-devel/clang:${LLVM_MAX_SLOT} )
-	cuda? ( sys-devel/clang:${LLVM_MAX_SLOT}[llvm_targets_NVPTX] )
+	${CLANG_DEPS}
 	debug? ( dev-util/lttng-ust )
 	hwloc? ( sys-apps/hwloc[cuda?] )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="${CLANG_DEPS}
+	virtual/pkgconfig
 	doc? (
 		$(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
 	)"
 
-PATCHES=( "${FILESDIR}/vendor_opencl_libs_location.patch" )
+PATCHES=(
+	"${FILESDIR}/vendor_opencl_libs_location.patch"
+)
 
 python_check_deps() {
 	has_version -b "<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() {
-	llvm_pkg_setup
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DENABLE_HSA=OFF
@@ -63,6 +76,7 @@ src_configure() {
 		-DKERNELLIB_HOST_CPU_VARIANTS=native
 		-DPOCL_ICD_ABSOLUTE_PATH=ON
 		-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)
@@ -73,8 +87,8 @@ src_configure() {
 		-DHARDENING_ENABLE=$(usex hardening)
 		-DPOCL_DEBUG_MESSAGES=$(usex debug)
 		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
-		-DWITH_LLVM_CONFIG=$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config
 	)
+
 	cmake_src_configure
 }
 
@@ -91,13 +105,16 @@ 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"
+		docompress -x /usr/share/doc/${P}/html
 	fi
+
 	if use examples; then
 		dodoc -r examples
-		docompress -x "/usr/share/doc/${P}/examples"
+		docompress -x /usr/share/doc/${P}/examples
 	fi
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2021-09-23  6:38 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-09-23  6:38 UTC (permalink / raw
  To: gentoo-commits

commit:     d3869995dd4cd8903dd9ceb5b85d45dd57c3a8e6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 23 06:38:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 06:38:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3869995

dev-libs/pocl: fix MissingSlotDep on LLVM

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/{pocl-1.7-r1.ebuild => pocl-1.7-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-1.7-r1.ebuild b/dev-libs/pocl/pocl-1.7-r2.ebuild
similarity index 98%
rename from dev-libs/pocl/pocl-1.7-r1.ebuild
rename to dev-libs/pocl/pocl-1.7-r2.ebuild
index d5f2724b962..be663cd6f58 100644
--- a/dev-libs/pocl/pocl-1.7-r1.ebuild
+++ b/dev-libs/pocl/pocl-1.7-r2.ebuild
@@ -30,7 +30,7 @@ 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))
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
 	virtual/opencl
 
 	${CLANG_DEPS}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2021-10-13  1:12 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-10-13  1:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e9b38e06367dd47eb4500f847f9348013c160268
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 13 01:09:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 13 01:12:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b38e06

dev-libs/pocl: add 1.8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/Manifest        |   1 +
 dev-libs/pocl/pocl-1.8.ebuild | 126 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 4ac613d41bb..4f3243ab7a6 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1 +1,2 @@
 DIST pocl-1.7.tar.gz 1577676 BLAKE2B 50d4f50236b1c81f319b5559ca2b1df529209f07899acf51c487820d97cc6766c5130a55afca910517c7db63d8041ac8306062880c3a821cbc1bf9108bf13d65 SHA512 23bb82b25a222186c001b2ed413f26253e1e0e16518e98c95173f51491e15d107e6ab1b334ffd490b41199743267d9ad64882a22fea327e17ec9604f9847fc38
+DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d

diff --git a/dev-libs/pocl/pocl-1.8.ebuild b/dev-libs/pocl/pocl-1.8.ebuild
new file mode 100644
index 00000000000..6f112bf4913
--- /dev/null
+++ b/dev-libs/pocl/pocl-1.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCS_AUTODOC=0
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/sphinx/source"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+LLVM_MAX_SLOT=13
+
+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 cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager 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}/vendor_opencl_libs_location.patch"
+)
+
+python_check_deps() {
+	has_version -b "<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 mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_HSA=OFF
+		-DENABLE_ICD=ON
+		-DENABLE_POCL_BUILDING=ON
+		-DKERNELLIB_HOST_CPU_VARIANTS=native
+		-DPOCL_ICD_ABSOLUTE_PATH=ON
+		-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_HOST_CPU_DEVICE_CL20=$(usex cl20)
+		-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
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2021-10-29 22:44 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-10-29 22:44 UTC (permalink / raw
  To: gentoo-commits

commit:     b4e55fd0e3d94bc08786ed83a6a4183168ebfc30
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 22:43:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 22:43:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e55fd0

dev-libs/pocl: add hwloc subslot operator

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/{pocl-1.7-r2.ebuild => pocl-1.7-r3.ebuild} | 4 ++--
 dev-libs/pocl/{pocl-1.8.ebuild => pocl-1.8-r1.ebuild}    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/pocl/pocl-1.7-r2.ebuild b/dev-libs/pocl/pocl-1.7-r3.ebuild
similarity index 97%
rename from dev-libs/pocl/pocl-1.7-r2.ebuild
rename to dev-libs/pocl/pocl-1.7-r3.ebuild
index be663cd6f58..1bdb29346d5 100644
--- a/dev-libs/pocl/pocl-1.7-r2.ebuild
+++ b/dev-libs/pocl/pocl-1.7-r3.ebuild
@@ -34,8 +34,8 @@ RDEPEND="
 	virtual/opencl
 
 	${CLANG_DEPS}
-	debug? ( dev-util/lttng-ust )
-	hwloc? ( sys-apps/hwloc[cuda?] )
+	debug? ( dev-util/lttng-ust:= )
+	hwloc? ( sys-apps/hwloc:=[cuda?] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="${CLANG_DEPS}

diff --git a/dev-libs/pocl/pocl-1.8.ebuild b/dev-libs/pocl/pocl-1.8-r1.ebuild
similarity index 97%
rename from dev-libs/pocl/pocl-1.8.ebuild
rename to dev-libs/pocl/pocl-1.8-r1.ebuild
index 6f112bf4913..6ee4d704b51 100644
--- a/dev-libs/pocl/pocl-1.8.ebuild
+++ b/dev-libs/pocl/pocl-1.8-r1.ebuild
@@ -34,8 +34,8 @@ RDEPEND="
 	virtual/opencl
 
 	${CLANG_DEPS}
-	debug? ( dev-util/lttng-ust )
-	hwloc? ( sys-apps/hwloc[cuda?] )
+	debug? ( dev-util/lttng-ust:= )
+	hwloc? ( sys-apps/hwloc:=[cuda?] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="${CLANG_DEPS}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-01-03  7:41 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-01-03  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c127713269a116c187d54663e0523b9f79f11886
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 14 06:14:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 07:40:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1277132

dev-libs/pocl: use 'distro' option for built kernels

We can't know what CPU the user will run the
built package on (think of binpkgs) so let's
use the 'distro' option which builds for
most common SIMD instructions and chooses
the most appropriate kernel it built at runtime.

Closes: https://bugs.gentoo.org/829128
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-1.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-1.8-r1.ebuild b/dev-libs/pocl/pocl-1.8-r1.ebuild
index 6ee4d704b519..13e8dd263413 100644
--- a/dev-libs/pocl/pocl-1.8-r1.ebuild
+++ b/dev-libs/pocl/pocl-1.8-r1.ebuild
@@ -73,7 +73,7 @@ src_configure() {
 		-DENABLE_HSA=OFF
 		-DENABLE_ICD=ON
 		-DENABLE_POCL_BUILDING=ON
-		-DKERNELLIB_HOST_CPU_VARIANTS=native
+		-DKERNELLIB_HOST_CPU_VARIANTS=distro
 		-DPOCL_ICD_ABSOLUTE_PATH=ON
 		-DSTATIC_LLVM=OFF
 		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-01-03  8:02 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-01-03  8:02 UTC (permalink / raw
  To: gentoo-commits

commit:     414a82e33c4bbe85f7b85bb2a982729087780794
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 08:02:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 08:02:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=414a82e3

dev-libs/pocl: revbump for installed (opencl) kernel change

Fixes: c127713269a116c187d54663e0523b9f79f11886
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/{pocl-1.8-r1.ebuild => pocl-1.8-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-1.8-r1.ebuild b/dev-libs/pocl/pocl-1.8-r2.ebuild
similarity index 98%
rename from dev-libs/pocl/pocl-1.8-r1.ebuild
rename to dev-libs/pocl/pocl-1.8-r2.ebuild
index 13e8dd263413..2c7536c0a22d 100644
--- a/dev-libs/pocl/pocl-1.8-r1.ebuild
+++ b/dev-libs/pocl/pocl-1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-04-17 16:44 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-04-17 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     d40f792545629e12a42f3936ffe36d79129baa2d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 16:35:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 16:35:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40f7925

dev-libs/pocl: drop 1.7-r3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/Manifest           |   1 -
 dev-libs/pocl/pocl-1.7-r3.ebuild | 120 ---------------------------------------
 2 files changed, 121 deletions(-)

diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 4f3243ab7a6f..eacf11d34468 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,2 +1 @@
-DIST pocl-1.7.tar.gz 1577676 BLAKE2B 50d4f50236b1c81f319b5559ca2b1df529209f07899acf51c487820d97cc6766c5130a55afca910517c7db63d8041ac8306062880c3a821cbc1bf9108bf13d65 SHA512 23bb82b25a222186c001b2ed413f26253e1e0e16518e98c95173f51491e15d107e6ab1b334ffd490b41199743267d9ad64882a22fea327e17ec9604f9847fc38
 DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d

diff --git a/dev-libs/pocl/pocl-1.7-r3.ebuild b/dev-libs/pocl/pocl-1.7-r3.ebuild
deleted file mode 100644
index 1bdb29346d53..000000000000
--- a/dev-libs/pocl/pocl-1.7-r3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_AUTODOC=0
-DOCS_BUILDER="sphinx"
-DOCS_DIR="doc/sphinx/source"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit cmake llvm python-any-r1 docs
-
-LLVM_MAX_SLOT=12
-
-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"
-IUSE="accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager test" #hsa tce
-
-RESTRICT="!test? ( test ) mirror"
-
-# 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}/vendor_opencl_libs_location.patch"
-)
-
-python_check_deps() {
-	has_version -b "<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 mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DENABLE_HSA=OFF
-		-DENABLE_ICD=ON
-		-DENABLE_POCL_BUILDING=ON
-		-DKERNELLIB_HOST_CPU_VARIANTS=native
-		-DPOCL_ICD_ABSOLUTE_PATH=ON
-		-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_HOST_CPU_DEVICE_CL20=$(usex cl20)
-		-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)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-src_test() {
-	export POCL_BUILDING=1
-	export CTEST_OUTPUT_ON_FAILURE=1
-	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
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-07-20  5:10 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-07-20  5:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3b578343fd4bad730e2e0a331274cd5bba773e91
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 05:05:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 05:09:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b578343

dev-libs/pocl: add PPC64 support

No keyword yet as apparently virtual/opencl isn't keyworded on ppc64?

Closes: https://bugs.gentoo.org/831859
Thanks-to:  Chris Kerr <chris.kerr <AT> mykolab.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-3.0.ebuild | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild
index 4845b2e15a71..629cf11a51ed 100644
--- a/dev-libs/pocl/pocl-3.0.ebuild
+++ b/dev-libs/pocl/pocl-3.0.ebuild
@@ -69,6 +69,18 @@ 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
 
@@ -79,7 +91,7 @@ src_configure() {
 		-DENABLE_IPO=$(usex lto)
 
 		-DENABLE_POCL_BUILDING=ON
-		-DKERNELLIB_HOST_CPU_VARIANTS=distro
+		-DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
 
 		-DSTATIC_LLVM=OFF
 		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-07-24  1:07 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-07-24  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     9897f940ba92eeaa4b10f5c3ddf9029be6ec093a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 01:05:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 01:05:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9897f940

dev-libs/pocl: keyword 3.0 for ~ppc64

Bug: https://bugs.gentoo.org/831859
Bug: https://bugs.gentoo.org/860288
Thanks-to: Chris Kerr <chris.kerr <AT> mykolab.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild
index 629cf11a51ed..2b61340eae95 100644
--- a/dev-libs/pocl/pocl-3.0.ebuild
+++ b/dev-libs/pocl/pocl-3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+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(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-07-26  4:49 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-07-26  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     57925fae4d43aebf440329a1105c437883d43cfa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 04:48:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 04:48:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57925fae

dev-libs/pocl: Stabilize 3.0 amd64, #861113

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild
index 2b61340eae95..5582d49d36b2 100644
--- a/dev-libs/pocl/pocl-3.0.ebuild
+++ b/dev-libs/pocl/pocl-3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+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(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-07-26  4:49 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-07-26  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     5a4f4f964207d51b630e290be0f522f0e3d315f7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 04:48:53 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 04:48:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4f4f96

dev-libs/pocl: Stabilize 3.0 ppc64, #861113

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild
index 5582d49d36b2..ea851bab85ab 100644
--- a/dev-libs/pocl/pocl-3.0.ebuild
+++ b/dev-libs/pocl/pocl-3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+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(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-08-08  6:08 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-08-08  6:08 UTC (permalink / raw
  To: gentoo-commits

commit:     2df171bf2190f791dd6252ab787fb15164bc7df2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  8 04:17:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 06:08:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df171bf

dev-libs/pocl: fix PythonHasVersionUsage

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-1.8-r2.ebuild | 2 +-
 dev-libs/pocl/pocl-3.0.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/pocl/pocl-1.8-r2.ebuild b/dev-libs/pocl/pocl-1.8-r2.ebuild
index 2c7536c0a22d..cba8d60fd806 100644
--- a/dev-libs/pocl/pocl-1.8-r2.ebuild
+++ b/dev-libs/pocl/pocl-1.8-r2.ebuild
@@ -49,7 +49,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version -b "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
+	python_has_version "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
 }
 
 llvm_check_deps() {

diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild
index ea851bab85ab..51f20465bc25 100644
--- a/dev-libs/pocl/pocl-3.0.ebuild
+++ b/dev-libs/pocl/pocl-3.0.ebuild
@@ -50,7 +50,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-	has_version -b "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
+	python_has_version "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
 }
 
 llvm_check_deps() {


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2022-12-10  4:48 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-12-10  4:48 UTC (permalink / raw
  To: gentoo-commits

commit:     7eb6b56943eb535d718a0e17edd11d991d0e0496
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 04:48:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 04:48:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb6b569

dev-libs/pocl: add 3.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/Manifest        |   1 +
 dev-libs/pocl/pocl-3.1.ebuild | 136 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+)

diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 3fefa356fa2d..c053b08330a1 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1 +1,2 @@
 DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea
+DIST pocl-3.1.tar.gz 1928607 BLAKE2B 7044a96e361426408fabd973987a0d6956693e3c9095769ee94d7dac47a8841d7489933e94acd22451a1c8a2ca83cb8e6948aebe899b23a8a6080ef1b7b37e9c SHA512 40d17e81d715f6897aa1d97fd02834d45227d9d0bd4c70e76d727f9ad4df675c25b7158a862e20e63810182fdad82a3cb1e454668c3a6422a977e59c8325fa0c

diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
new file mode 100644
index 000000000000..b850953e2668
--- /dev/null
+++ b/dev-libs/pocl/pocl-3.1.ebuild
@@ -0,0 +1,136 @@
+# 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=15
+
+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}]')
+	)"
+
+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_ALMAIF_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
+
+	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
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2023-01-21  6:53 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2023-01-21  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     f7e8bbee8d970a41b4f0cc16a1d691025654c6fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 06:25:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 06:48:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e8bbee

dev-libs/pocl: drop incomplete docs support

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-3.1.ebuild | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
index f5e877a39aea..29653f03a564 100644
--- a/dev-libs/pocl/pocl-3.1.ebuild
+++ b/dev-libs/pocl/pocl-3.1.ebuild
@@ -3,13 +3,9 @@
 
 EAPI=8
 
-DOCS_AUTODOC=0
-DOCS_BUILDER="sphinx"
-DOCS_DIR="doc/sphinx/source"
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
 LLVM_MAX_SLOT=15
 
-inherit cmake llvm python-any-r1 docs
+inherit cmake llvm
 
 DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
 HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
@@ -26,8 +22,10 @@ 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] )"
+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)):*
@@ -38,15 +36,10 @@ RDEPEND="
 	hwloc? ( sys-apps/hwloc:=[cuda?] )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="${CLANG_DEPS}
+BDEPEND="
+	${CLANG_DEPS}
 	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
-	)"
-
-python_check_deps() {
-	python_has_version "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
-}
+"
 
 llvm_check_deps() {
 	local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
@@ -62,8 +55,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-
 	llvm_pkg_setup
 }
 
@@ -111,7 +102,6 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-	docs_compile
 }
 
 src_test() {
@@ -128,11 +118,6 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	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


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2023-02-23 20:14 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2023-02-23 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     493b676cf20e9509a6daffa1af69ec30fa2894f0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 20:14:15 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 20:14:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493b676c

dev-libs/pocl: Stabilize 3.1 amd64, #895744

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-libs/pocl/pocl-3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
index 29653f03a564..8e9fc23e3d86 100644
--- a/dev-libs/pocl/pocl-3.1.ebuild
+++ b/dev-libs/pocl/pocl-3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+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(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2023-02-27  0:20 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2023-02-27  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     da8af8906c93129c7498af877599db5a20c82573
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 00:20:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 00:20:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8af890

dev-libs/pocl: Stabilize 3.1 ppc64, #895744

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
index 8e9fc23e3d86..473aa1f2fa62 100644
--- a/dev-libs/pocl/pocl-3.1.ebuild
+++ b/dev-libs/pocl/pocl-3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+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(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2023-08-26  3:51 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2023-08-26  3:51 UTC (permalink / raw
  To: gentoo-commits

commit:     51d2f2ce2765f3974f89c5618e6a7132ac13f2d9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 02:43:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 02:43:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d2f2ce

dev-libs/pocl: add 4.0

Closes: https://bugs.gentoo.org/912675
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/Manifest        |   1 +
 dev-libs/pocl/pocl-4.0.ebuild | 112 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 014e89f51635..71518dab3615 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1 +1,2 @@
 DIST pocl-3.1.tar.gz 1928607 BLAKE2B 7044a96e361426408fabd973987a0d6956693e3c9095769ee94d7dac47a8841d7489933e94acd22451a1c8a2ca83cb8e6948aebe899b23a8a6080ef1b7b37e9c SHA512 40d17e81d715f6897aa1d97fd02834d45227d9d0bd4c70e76d727f9ad4df675c25b7158a862e20e63810182fdad82a3cb1e454668c3a6422a977e59c8325fa0c
+DIST pocl-4.0.tar.gz 2140919 BLAKE2B 1e9dd4de4824dd4a9e2b0d053d1786062c135d3bf7ca99dc884657b89c651fca6c0f3dedb568439802a58b0bfabc10939ca344b0110ae5fdb31be06f596d2a48 SHA512 3835a9e8fc8562d50a91a11b807cf87a096891f5c27675127b66412eacff2e541b6143b49b4155f43a09f4e53faa062ec20f3b20badeca206ece9f45ad50f26a

diff --git a/dev-libs/pocl/pocl-4.0.ebuild b/dev-libs/pocl/pocl-4.0.ebuild
new file mode 100644
index 000000000000..cce413824dc1
--- /dev/null
+++ b/dev-libs/pocl/pocl-4.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+inherit cmake llvm
+
+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
+"
+
+llvm_check_deps() {
+	local usedep=$(usev 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}"
+}
+
+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_ALMAIF_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_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
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${P}/examples
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2023-09-27  7:21 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2023-09-27  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     b99f3223b969ca1eac0d93f2bc4c338b095dede1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 07:21:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 07:21:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99f3223

dev-libs/pocl: Stabilize 4.0 ppc64, #914786

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-4.0.ebuild b/dev-libs/pocl/pocl-4.0.ebuild
index cce413824dc1..91b17547627a 100644
--- a/dev-libs/pocl/pocl-4.0.ebuild
+++ b/dev-libs/pocl/pocl-4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+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(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2023-09-27 13:29 Arthur Zamarin
  0 siblings, 0 replies; 24+ messages in thread
From: Arthur Zamarin @ 2023-09-27 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     8cfe817722e34f8de3473e74287ae01353d9935e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 13:28:08 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 13:28:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfe8177

dev-libs/pocl: Stabilize 4.0 amd64, #914786

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-libs/pocl/pocl-4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-4.0.ebuild b/dev-libs/pocl/pocl-4.0.ebuild
index 91b17547627a..2ffb95bda051 100644
--- a/dev-libs/pocl/pocl-4.0.ebuild
+++ b/dev-libs/pocl/pocl-4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc64"
+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(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2024-01-07 11:38 Michał Górny
  0 siblings, 0 replies; 24+ messages in thread
From: Michał Górny @ 2024-01-07 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e9276f91166f047f67d5987bf1f7c24f9e1793da
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 16:52:21 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 11:37:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9276f91

dev-libs/pocl: [QA] Remove invalid USE=lto

USE=lto in this package only appends -flto flag.  This is not a valid
use of the USE flag, as lto in Gentoo is enabled via setting flags
manually.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34490
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/pocl/pocl-4.0.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-libs/pocl/pocl-4.0.ebuild b/dev-libs/pocl/pocl-4.0.ebuild
index 2ffb95bda051..e8e313759963 100644
--- a/dev-libs/pocl/pocl-4.0.ebuild
+++ b/dev-libs/pocl/pocl-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc64"
 # TODO: hsa tce
-IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test"
+IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
 # Tests not yet passing, fragile in Portage environment(?)
 RESTRICT="!test? ( test ) test"
 
@@ -69,7 +69,8 @@ src_configure() {
 		-DPOCL_ICD_ABSOLUTE_PATH=ON
 		-DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
 
-		-DENABLE_IPO=$(usex lto)
+		# only appends -flto
+		-DENABLE_IPO=OFF
 
 		-DENABLE_POCL_BUILDING=ON
 		-DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2024-07-08 11:39 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-07-08 11:39 UTC (permalink / raw
  To: gentoo-commits

commit:     a4f69f95bd8d46aba0f4eefa44d84dca70d2a8fe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  8 11:37:58 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul  8 11:38:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f69f95

dev-libs/pocl: add 6.0

Bug: https://bugs.gentoo.org/922912
Closes: https://bugs.gentoo.org/907333
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/Manifest        |   1 +
 dev-libs/pocl/pocl-6.0.ebuild | 109 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 336dcf9d0f22..3d8203f4e5c7 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,2 +1,3 @@
 DIST pocl-4.0.tar.gz 2140919 BLAKE2B 1e9dd4de4824dd4a9e2b0d053d1786062c135d3bf7ca99dc884657b89c651fca6c0f3dedb568439802a58b0bfabc10939ca344b0110ae5fdb31be06f596d2a48 SHA512 3835a9e8fc8562d50a91a11b807cf87a096891f5c27675127b66412eacff2e541b6143b49b4155f43a09f4e53faa062ec20f3b20badeca206ece9f45ad50f26a
 DIST pocl-5.0.tar.gz 2361502 BLAKE2B eca07953ff56e7e4ca10f71db12819547bc8ff28da26e569c3544edd802f9ded0a8bd0d9cb260069cfe3788f9bc6c84d6ae96c1148c4e92fe6268a95a60ee5b6 SHA512 c2d6c80cbcba7af1c31dfa794c2aa7be6d1ce2cc9900fbf6e0a1536747440602cdc0f1a84f81f85737818a7ea60b490558ef328b3b156e52c63db3fe4ce490b0
+DIST pocl-6.0.tar.gz 2466652 BLAKE2B e074f35bfe8ccd70038fe05ca01da033849bed83075330f1149597455a5892281d4d09b8db5b4731e7e0c248d1ffdc8e8707c1ebe53d50624294ad92aa886be6 SHA512 a24efadbbb81c810cd5c4bbb8abfa75b9bbdfeca786e8471dd75d40a78024d04c1b5c5a7114e75e1eb70a1b6a3756bb47ba741de0f1c4d1416fbce4688d62cc0

diff --git a/dev-libs/pocl/pocl-6.0.ebuild b/dev-libs/pocl/pocl-6.0.ebuild
new file mode 100644
index 000000000000..f88860b92181
--- /dev/null
+++ b/dev-libs/pocl/pocl-6.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+inherit cmake llvm-r1
+
+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 test"
+# Tests not yet passing, fragile in Portage environment(?)
+RESTRICT="!test? ( test ) test"
+
+CLANG_DEPS="
+	$(llvm_gen_dep '
+		!cuda? (
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		)
+		cuda? (
+			sys-devel/clang:${LLVM_SLOT}=[llvm_targets_NVPTX]
+			sys-devel/llvm:${LLVM_SLOT}=[llvm_targets_NVPTX]
+		)
+	')
+"
+RDEPEND="
+	${CLANG_DEPS}
+	dev-libs/libltdl
+	virtual/opencl
+	debug? ( dev-util/lttng-ust:= )
+	hwloc? ( sys-apps/hwloc:=[cuda?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${CLANG_DEPS}
+	virtual/pkgconfig
+"
+
+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"
+	elif use riscv; then
+		host_cpu_variants="generic-rv64"
+	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"
+
+		# only appends -flto
+		-DENABLE_IPO=OFF
+
+		-DENABLE_POCL_BUILDING=ON
+		-DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
+
+		-DSTATIC_LLVM=OFF
+		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d)/bin/llvm-config
+
+		-DENABLE_ALMAIF_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_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
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${P}/examples
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2024-07-08 11:43 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-07-08 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8d0ba00c09c570d1cffbcb59883e48282030f4af
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  8 11:42:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul  8 11:43:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0ba00c

dev-libs/pocl: add CUDA dep, use cuda.eclass

I'm not sure if need to specify CUDA_TOOLKIT_ROOT_DIR with this
or not (or what the right way to get it is). I can't check CUDA on
this machine either, although I have another I can on.

Closes: https://bugs.gentoo.org/919271
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-6.0.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-6.0.ebuild b/dev-libs/pocl/pocl-6.0.ebuild
index f88860b92181..c16b713bd7c3 100644
--- a/dev-libs/pocl/pocl-6.0.ebuild
+++ b/dev-libs/pocl/pocl-6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LLVM_COMPAT=( {15..18} )
-inherit cmake llvm-r1
+inherit cmake cuda llvm-r1
 
 DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
 HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
@@ -35,6 +35,7 @@ RDEPEND="
 	dev-libs/libltdl
 	virtual/opencl
 	debug? ( dev-util/lttng-ust:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	hwloc? ( sys-apps/hwloc:=[cuda?] )
 "
 DEPEND="${RDEPEND}"
@@ -43,6 +44,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake_src_prepare
+}
+
 src_configure() {
 	local host_cpu_variants="generic"
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2024-07-15  0:20 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-07-15  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     7919d6b616bf8a05e389d0f50aae4ce583cf689a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 00:19:58 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 00:19:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7919d6b6

dev-libs/pocl: Stabilize 6.0 ppc64, #935992

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-6.0.ebuild b/dev-libs/pocl/pocl-6.0.ebuild
index c16b713bd7c3..06498cb0fbc0 100644
--- a/dev-libs/pocl/pocl-6.0.ebuild
+++ b/dev-libs/pocl/pocl-6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ppc64"
 # TODO: hsa tce
 IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
 # Tests not yet passing, fragile in Portage environment(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/
@ 2024-07-15  1:39 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-07-15  1:39 UTC (permalink / raw
  To: gentoo-commits

commit:     6146047b7c8f510c0bb0ee1fe8a50dad9c36c681
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 01:38:58 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 01:38:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6146047b

dev-libs/pocl: Stabilize 6.0 amd64, #935992

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/pocl/pocl-6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/pocl/pocl-6.0.ebuild b/dev-libs/pocl/pocl-6.0.ebuild
index 06498cb0fbc0..2ae9dfbe316d 100644
--- a/dev-libs/pocl/pocl-6.0.ebuild
+++ b/dev-libs/pocl/pocl-6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc64"
+KEYWORDS="amd64 ppc64"
 # TODO: hsa tce
 IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
 # Tests not yet passing, fragile in Portage environment(?)


^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2024-07-15  1:39 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-27  0:20 [gentoo-commits] repo/gentoo:master commit in: dev-libs/pocl/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-07-15  1:39 Sam James
2024-07-15  0:20 Sam James
2024-07-08 11:43 Sam James
2024-07-08 11:39 Sam James
2024-01-07 11:38 Michał Górny
2023-09-27 13:29 Arthur Zamarin
2023-09-27  7:21 Sam James
2023-08-26  3:51 Sam James
2023-02-23 20:14 Arthur Zamarin
2023-01-21  6:53 Sam James
2022-12-10  4:48 Sam James
2022-08-08  6:08 Sam James
2022-07-26  4:49 Sam James
2022-07-26  4:49 Sam James
2022-07-24  1:07 Sam James
2022-07-20  5:10 Sam James
2022-04-17 16:44 Sam James
2022-01-03  8:02 Sam James
2022-01-03  7:41 Sam James
2021-10-29 22:44 Sam James
2021-10-13  1:12 Sam James
2021-09-23  6:38 Sam James
2021-09-23  6:36 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox