[gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/

["Michał Górny" <mgorny@gentoo.org>]

commit:     49fe1591b8692a955419f9bd944aa51b5e4f19b4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 10:18:39 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 10:34:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fe1591

sys-libs/libomp: Selectively enable deviceRTLs based on CHOST

deviceRTLs are only supported on amd64, aarch64 and ppc64le, and trying
to build them elsewhere may cause CMake failures.  Check CHOST
to determine whether to enable them.

Closes: https://bugs.gentoo.org/822369
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/libomp/libomp-13.0.0-r1.ebuild   | 32 +++++++++++++++++--------------
 sys-libs/libomp/libomp-13.0.0.9999.ebuild | 32 +++++++++++++++++--------------
 sys-libs/libomp/libomp-14.0.0.9999.ebuild | 32 +++++++++++++++++--------------
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/sys-libs/libomp/libomp-13.0.0-r1.ebuild b/sys-libs/libomp/libomp-13.0.0-r1.ebuild
index 9009d8a8295..e7e848f2cb2 100644
--- a/sys-libs/libomp/libomp-13.0.0-r1.ebuild
+++ b/sys-libs/libomp/libomp-13.0.0-r1.ebuild
@@ -93,20 +93,24 @@ multilib_src_configure() {
 		# disable unnecessary hack copying stuff back to srcdir
 		-DLIBOMP_COPY_EXPORTS=OFF
 	)
-	use offload && mycmakeargs+=(
-		# this is non-fatal and libomp checks for CUDA conditionally
-		# to ABI, so we can just ignore passing the wrong value
-		# on non-amd64 ABIs
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
-
-		-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
-		-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
-		# a cheap hack to force clang
-		-DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
-		# upstream defaults to looking for it in clang dir
-		# this fails when ccache is being used
-		-DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
-	)
+	if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+			-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
+			-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
+			# a cheap hack to force clang
+			-DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
+			# upstream defaults to looking for it in clang dir
+			# this fails when ccache is being used
+			-DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
+		)
+	else
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+			-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
+			-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
+		)
+	fi
 	use test && mycmakeargs+=(
 		# this project does not use standard LLVM cmake macros
 		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"

diff --git a/sys-libs/libomp/libomp-13.0.0.9999.ebuild b/sys-libs/libomp/libomp-13.0.0.9999.ebuild
index 8ff1b93cd2f..28c0f1fb620 100644
--- a/sys-libs/libomp/libomp-13.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-13.0.0.9999.ebuild
@@ -92,20 +92,24 @@ multilib_src_configure() {
 		# disable unnecessary hack copying stuff back to srcdir
 		-DLIBOMP_COPY_EXPORTS=OFF
 	)
-	use offload && mycmakeargs+=(
-		# this is non-fatal and libomp checks for CUDA conditionally
-		# to ABI, so we can just ignore passing the wrong value
-		# on non-amd64 ABIs
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
-
-		-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
-		-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
-		# a cheap hack to force clang
-		-DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
-		# upstream defaults to looking for it in clang dir
-		# this fails when ccache is being used
-		-DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
-	)
+	if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+			-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
+			-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
+			# a cheap hack to force clang
+			-DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
+			# upstream defaults to looking for it in clang dir
+			# this fails when ccache is being used
+			-DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
+		)
+	else
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+			-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
+			-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
+		)
+	fi
 	use test && mycmakeargs+=(
 		# this project does not use standard LLVM cmake macros
 		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"

diff --git a/sys-libs/libomp/libomp-14.0.0.9999.ebuild b/sys-libs/libomp/libomp-14.0.0.9999.ebuild
index 8ff1b93cd2f..28c0f1fb620 100644
--- a/sys-libs/libomp/libomp-14.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-14.0.0.9999.ebuild
@@ -92,20 +92,24 @@ multilib_src_configure() {
 		# disable unnecessary hack copying stuff back to srcdir
 		-DLIBOMP_COPY_EXPORTS=OFF
 	)
-	use offload && mycmakeargs+=(
-		# this is non-fatal and libomp checks for CUDA conditionally
-		# to ABI, so we can just ignore passing the wrong value
-		# on non-amd64 ABIs
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
-
-		-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
-		-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
-		# a cheap hack to force clang
-		-DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
-		# upstream defaults to looking for it in clang dir
-		# this fails when ccache is being used
-		-DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
-	)
+	if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+			-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
+			-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
+			# a cheap hack to force clang
+			-DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
+			# upstream defaults to looking for it in clang dir
+			# this fails when ccache is being used
+			-DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
+		)
+	else
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+			-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
+			-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
+		)
+	fi
 	use test && mycmakeargs+=(
 		# this project does not use standard LLVM cmake macros
 		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"