From 027dc9b3977cd14e0c7ae52e7bf9370c3919afa1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 31 Dec 2023 17:46:47 +0000
Subject: gentoo auto-resync : 31:12:2023 - 17:46:47

---
 dev-lang/ispc/Manifest              |  4 +-
 dev-lang/ispc/ispc-1.22.0-r1.ebuild | 99 +++++++++++++++++++++++++++++++++++++
 dev-lang/ispc/ispc-1.22.0.ebuild    | 81 ------------------------------
 dev-lang/ispc/metadata.xml          |  8 +++
 4 files changed, 109 insertions(+), 83 deletions(-)
 create mode 100644 dev-lang/ispc/ispc-1.22.0-r1.ebuild
 delete mode 100644 dev-lang/ispc/ispc-1.22.0.ebuild

(limited to 'dev-lang/ispc')

diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 5feabb4c81bb..f807c446c21d 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -3,5 +3,5 @@ AUX ispc-1.19.0-gcc13.patch 777 BLAKE2B fa65718e6f15575fc2f0339e5e4c47c225a8423d
 DIST ispc-1.19.0.tar.gz 19577782 BLAKE2B 5ad6eeeeb0bb27f2a27267a26a729693bd16250ae5e8740728290fe6ad85c7ecd4da40f316f2ca6b1447ff3a13f6949db4ed2af6ebf2c6ce6ba43620dfb1943d SHA512 140f16bc0f9e0a94853b50a5433be9196ee09b6c70a1840d400d0d201143da8cb2b1b92a857acf5856ed3410bfffd17678eb1029996f9007fe947f5ac78bf1bb
 DIST ispc-1.22.0.gh.tar.gz 19618494 BLAKE2B 0dae95d792e4d629b38a9775c2c600131374c69dfa086d6a67100e40e5005ef054b9a651f418e0452a19ee4e64ffd830bfaa787b14e706473e8fab1d2380f0fd SHA512 4436ea37003b4cbfefcbf4c18212d0e98536243ae8f01053817d579e04205a4dcd4ab7b2b282fec99fc617009fdbea340b348cf4a2134240d2fcfc6bcaf6b60c
 EBUILD ispc-1.19.0.ebuild 1731 BLAKE2B 202bba276fa2de28294cbe6532470361b948c4262b854762493b76cad1545adc92fe562d1461047126e9aeac707bb3d716b55aad20ed5b8dbec3b29756ad2d79 SHA512 a09bb34829b50b9f6561f74c27bf7761ff35bcb4a383df021c7441041d60ac021f934eb5130050e7792836c7510eb822492d60ceaf15bab36f80b69cdfdffde2
-EBUILD ispc-1.22.0.ebuild 1636 BLAKE2B f858b30e71a06855a4e8516eae360ae83544ef8a0ec9b1bd4e2f23fbf41960339317f728389730a2db7a4c3dea357ecf2bc340caf70cb138e19096c7485f6e1b SHA512 43b3459fbe028e47ffaa8d4756f46e44f847e6b2724d75ef9b3e9e0790bcd8761df1dd89f3da42051f475f94dd74df79a683c01103bc0d1157933e37e564c1f1
-MISC metadata.xml 322 BLAKE2B 92aba14715791dec4d88632df313089320116a7ad85d70e311ccb025c7a07ce19e26a46d94fdf772a252d7077f5f70971ac65f7aeff30e6056423dde0d9fb0a5 SHA512 0afd1c427ba9e0065a284acabbde6cc8e8ecd50fe8ae78f6bae194b4a441797a908d2ae69539d5b6d5dc609b9240c632f0f433a3c496b00d8fcad15d6affc922
+EBUILD ispc-1.22.0-r1.ebuild 2279 BLAKE2B 345d75790130fb669e605e6092ecb35c01cf4b5c4b9b039174fd82059e9fc64bc4787d963688118a7ab3c97d2b1c585aa09251bc8ca7b0c0b7479226385bfb3b SHA512 12f7d11392190bc72af291d0624cd9bf6bf9fc85cd394fa9ddf1fe44d4b75169f62e40db4d54bd2c6017e5043bb0e604e4fdcbfcdfb4525e51f44a1fb8a15e19
+MISC metadata.xml 509 BLAKE2B b605dfbff352fab4fcc58ad46f89f97d5db8522de237a0623021c521231798ad00b2b8cd82ce6840d86cfebbe185e6e767e8d0ec276b03a68554ecad20e6b96d SHA512 eae5fcfb0d56190f969ac83012624965b00bd757d8be0bbafce74ab1ea119dc4ee0c33076dd447fabf0a6a6d5f1e2783b54f6c59ebd7aa0a35a4a27df7db01f9
diff --git a/dev-lang/ispc/ispc-1.22.0-r1.ebuild b/dev-lang/ispc/ispc-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..d05fa1f7195e
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.22.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+LLVM_MAX_SLOT=17
+
+inherit cmake llvm multiprocessing python-any-r1 toolchain-funcs
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="
+	https://ispc.github.io/
+	https://github.com/ispc/ispc/
+"
+SRC_URI="
+	https://github.com/ispc/ispc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="examples gpu openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	sys-libs/ncurses:=
+	gpu? ( dev-libs/level-zero:= )
+	!openmp? ( dev-cpp/tbb:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	${PYTHON_DEPS}
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use amd64; then
+		# On amd64 systems, build system enables x86/i686 build too.
+		# This ebuild doesn't even have multilib support, nor need it.
+		# https://bugs.gentoo.org/730062
+		ewarn "Removing auto-x86 build on amd64"
+		sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
+	fi
+
+	# do not require bundled gtest
+	mkdir -p ispcrt/tests/vendor/google/googletest || die
+	cat > ispcrt/tests/vendor/google/googletest/CMakeLists.txt <<-EOF || die
+		find_package(GTest)
+	EOF
+	# remove hacks that break unbundling
+	sed -i -e '/gmock/d' -e '/install/,$d' ispcrt/tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DARM_ENABLED=$(usex arm)
+		-DCMAKE_SKIP_RPATH=ON
+		-DISPC_INCLUDE_EXAMPLES=OFF
+		-DISPC_INCLUDE_TESTS=$(usex test)
+		-DISPC_INCLUDE_UTILS=OFF
+		-DISPCRT_BUILD_GPU=$(usex gpu)
+		-DISPCRT_BUILD_TASK_MODEL=$(usex openmp OpenMP TBB)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Inject path to prevent using system ispc
+	local -x PATH="${BUILD_DIR}/bin:${PATH}"
+	"${EPYTHON}" ./run_tests.py "-j$(makeopts_jobs)" -v ||
+		die "Testing failed under ${EPYTHON}"
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
diff --git a/dev-lang/ispc/ispc-1.22.0.ebuild b/dev-lang/ispc/ispc-1.22.0.ebuild
deleted file mode 100644
index fb2b1f2ba1d3..000000000000
--- a/dev-lang/ispc/ispc-1.22.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-LLVM_MAX_SLOT=17
-
-inherit cmake multiprocessing python-any-r1 llvm
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="
-	https://ispc.github.io/
-	https://github.com/ispc/ispc/
-"
-SRC_URI="
-	https://github.com/ispc/ispc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-"
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use amd64; then
-		# On amd64 systems, build system enables x86/i686 build too.
-		# This ebuild doesn't even have multilib support, nor need it.
-		# https://bugs.gentoo.org/730062
-		ewarn "Removing auto-x86 build on amd64"
-		sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARM_ENABLED=$(usex arm)
-		-DCMAKE_SKIP_RPATH=ON
-		-DISPC_INCLUDE_EXAMPLES=OFF
-		-DISPC_INCLUDE_TESTS=$(usex test)
-		-DISPC_INCLUDE_UTILS=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# Inject path to prevent using system ispc
-	local -x PATH="${BUILD_DIR}/bin:${PATH}"
-	"${EPYTHON}" ./run_tests.py "-j$(makeopts_jobs)" -v ||
-		die "Testing failed under ${EPYTHON}"
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-lang/ispc/metadata.xml b/dev-lang/ispc/metadata.xml
index d25a0ca74f67..1ac64e1abb82 100644
--- a/dev-lang/ispc/metadata.xml
+++ b/dev-lang/ispc/metadata.xml
@@ -8,4 +8,12 @@
 	<upstream>
 		<remote-id type="github">ispc/ispc</remote-id>
 	</upstream>
+	<use>
+		<flag name="gpu">
+			Enable Level0 GPU support in ispcrt.
+		</flag>
+		<flag name="openmp">
+			Build with OpenMP task model (otherwise, TBB task model is used).
+		</flag>
+	</use>
 </pkgmetadata>
-- 
cgit v1.2.3