diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-28 15:04:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-28 15:04:41 +0100 |
| commit | e74494cd71c90a42f7cf78ec655c9c883a26c42a (patch) | |
| tree | 06c91f279ebdf8ba4dcdab90385d7fb04a4d0e27 /sys-libs/libomp | |
| parent | 35e8572a0d6310d3eac4be1600ef2de6cb6881ab (diff) | |
gentoo auto-resync : 28:07:2022 - 15:04:40
Diffstat (limited to 'sys-libs/libomp')
| -rw-r--r-- | sys-libs/libomp/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/libomp/libomp-15.0.0.9999.ebuild | 25 |
2 files changed, 7 insertions, 20 deletions
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index 48cd54ba8f77..042b6f974169 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -8,5 +8,5 @@ EBUILD libomp-13.0.1.ebuild 3836 BLAKE2B bfecc3ecb5928ba0c4f1e79baf7108705b33b65 EBUILD libomp-14.0.4.ebuild 3823 BLAKE2B 4d60017e3f8b82fa5e45d4524039bafca2c81c859dcdfc25232e500e1b7e955b7eed3cd6dcd79a67da9182f0545b88af8d9426a95dc314122415a5bf8f94e2c3 SHA512 fd08853add3a0c7a38b5c5f7501d24f4a879f3a0aaf936df82c7a40a7235852b4998bb11fcf969bbebb3c849f5aa06179d23763cfcdb02b4609aa5ece0473770 EBUILD libomp-14.0.6-r1.ebuild 3851 BLAKE2B 305000b58e0c3dfc970028705928afd31dd61d881af764b666acc57a42823f2041fc48af19571c4c07e5d3f0ed4efb14a22b882490070a6980f3cfd93cf54a8c SHA512 949b2dadf7745e86281ca1c7594133143aa6c6027a102f8928ce9faea10a2099353bf4074be4469394fa9774e737f584cf44c6eec94af30b9d332f20b9e4621c EBUILD libomp-14.0.6.ebuild 3828 BLAKE2B 0887d1ac8543821e06bb09a1c3b3331c7d727fc9101232893f19270a7bdc0092c9be0c85e5a9976450e7c131fff8918346515fbf880c700ebd113a5c399948a8 SHA512 d82f5e9129e7515cbf2d836519de4b7ddecc14ed9948584f3a49ea58d6dbd27a0b90a88d5329a9bc568e4063daf0c9ce8755c6c9ddcadad1a56a1f7142511721 -EBUILD libomp-15.0.0.9999.ebuild 3762 BLAKE2B ec449c1019da76ad9d1835e9a86f776e97a83740da240a2e98221d3f5d5eff7911b894584bb37da8fe2375670d5a6a67e41a5523f957694cd3e138543b5ba925 SHA512 643d3c43a9fba97ea44b94d3edd07ffbb487aa8260856fed8a158646873a7e45797c11aed020b224642db7e90da0fb705cd10f69fd0da5139d42b9560b9f2542 +EBUILD libomp-15.0.0.9999.ebuild 3250 BLAKE2B 38ebbaa5f6c0551d37c7a32460c2c68e7c8d3cc7a6f3d0aec96f7a469e75ea04eb3108485c7c2287f99f612e99a8ed4e91a196e05545b374e642403af2696a52 SHA512 8394e1da91788ef1fed9f94aecdf5edcd51965b2a5c5967a586cb890ccf3b18c75dee91af3e250af60b5de2edc474874fe598ca3b26cc257a9369e0ffbbfe77a MISC metadata.xml 826 BLAKE2B 94bad2982b52156c2755f4fcdc534648e30b45b514f486028d7beba9af050c3c6847a33fdc11cbf26195794b8e8a7cbeb4e110b8b4398f784c7b7c3edeea02ca SHA512 60de2890b1edc3d60feb5b04dbce840b17e0812ff301f00fd7c12242d3b81cdb3b8ad7afeb3624d70526a93cf8285c96a65b5fcd0384dd093b722c1ae645fa2f 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 |