From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 81E87158094 for ; Thu, 28 Jul 2022 08:45:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85C84E0E32; Thu, 28 Jul 2022 08:45:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 698BEE0E32 for ; Thu, 28 Jul 2022 08:45:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B2DF34068A for ; Thu, 28 Jul 2022 08:45:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 723BD556 for ; Thu, 28 Jul 2022 08:45:33 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1658997929.e38cc94ced4b4ee67c3e6db7bc0d9aaa601a8887.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libomp/libomp-15.0.0.9999.ebuild X-VCS-Directories: sys-libs/libomp/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e38cc94ced4b4ee67c3e6db7bc0d9aaa601a8887 X-VCS-Branch: master Date: Thu, 28 Jul 2022 08:45:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: af6a8473-93ee-4882-87e3-81106b01b359 X-Archives-Hash: 614f655efe04a8e4a1e8dd31d57cf1d9 commit: e38cc94ced4b4ee67c3e6db7bc0d9aaa601a8887 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 28 08:44:43 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 28 08:45:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e38cc94c sys-libs/libomp: Update the ebuild for 15.x Signed-off-by: Michał Górny gentoo.org> sys-libs/libomp/libomp-15.0.0.9999.ebuild | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/sys-libs/libomp/libomp-15.0.0.9999.ebuild b/sys-libs/libomp/libomp-15.0.0.9999.ebuild index 52f9f5285f11..5ded2b167951 100644 --- a/sys-libs/libomp/libomp-15.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-15.0.0.9999.ebuild @@ -14,15 +14,10 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" IUSE=" - cuda debug hwloc offload ompt test + debug hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX " RESTRICT="!test? ( test )" -# CUDA works only with the x86_64 ABI -REQUIRED_USE=" - cuda? ( llvm_targets_NVPTX ) - offload? ( cuda? ( abi_x86_64 ) ) -" RDEPEND=" hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] ) @@ -30,7 +25,6 @@ RDEPEND=" virtual/libelf:=[${MULTILIB_USEDEP}] dev-libs/libffi:=[${MULTILIB_USEDEP}] ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}] - cuda? ( dev-util/nvidia-cuda-toolkit:= ) ) " # tests: @@ -53,7 +47,7 @@ BDEPEND=" ) " -LLVM_COMPONENTS=( openmp llvm/include ) +LLVM_COMPONENTS=( openmp cmake llvm/include ) llvm.org_set_globals python_check_deps() { @@ -104,20 +98,13 @@ multilib_src_configure() { if use offload; then if 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)" + -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU) + -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX) ) else mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF + -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF + -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF ) fi fi