From 1aea2894cdc65d5a2aa39c675e39578dd6eceb06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 11 Dec 2024 12:10:38 +0100 Subject: [PATCH] =?UTF-8?q?Move=20sys-libs/libomp=20=E2=86=92=20llvm-runti?= =?UTF-8?q?mes/openmp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- app-portage/portage-utils/portage-utils-0.95-r1.ebuild | 4 ++-- app-portage/portage-utils/portage-utils-0.96-r1.ebuild | 4 ++-- app-portage/portage-utils/portage-utils-0.96.1.ebuild | 4 ++-- app-portage/portage-utils/portage-utils-0.97.ebuild | 2 +- app-portage/portage-utils/portage-utils-9999.ebuild | 4 ++-- dev-cpp/eigen/eigen-3.4.0-r2.ebuild | 2 +- dev-cpp/eigen/eigen-3.4.0-r3.ebuild | 2 +- dev-cpp/eigen/eigen-9999.ebuild | 2 +- dev-lang/souffle/souffle-2.4.1.ebuild | 4 ++-- eclass/toolchain-funcs.eclass | 2 +- llvm-runtimes/offload/offload-20.0.0.9999.ebuild | 2 +- llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild | 2 +- {sys-libs/libomp => llvm-runtimes/openmp}/Manifest | 0 {sys-libs/libomp => llvm-runtimes/openmp}/metadata.xml | 0 .../openmp/openmp-15.0.7-r6.ebuild | 2 +- .../openmp/openmp-16.0.6.ebuild | 0 .../openmp/openmp-17.0.6.ebuild | 0 .../openmp/openmp-18.1.8.ebuild | 0 .../openmp/openmp-19.1.4.ebuild | 0 .../openmp/openmp-19.1.5.ebuild | 0 .../openmp/openmp-20.0.0.9999.ebuild | 0 .../openmp/openmp-20.0.0_pre20241207.ebuild | 0 media-gfx/mypaint/mypaint-2.0.1-r3.ebuild | 2 +- media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild | 2 +- media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild | 2 +- metadata/stabilization-groups/llvm.group | 2 +- profiles/arch/amd64/package.use | 2 +- profiles/arch/amd64/package.use.mask | 4 ++-- profiles/arch/amd64/package.use.stable.mask | 2 +- profiles/arch/arm64/package.use.mask | 2 +- profiles/arch/base/package.use.mask | 2 +- profiles/arch/powerpc/ppc32/package.mask | 4 ++-- profiles/arch/powerpc/ppc32/package.use.mask | 2 +- profiles/arch/powerpc/ppc64/package.use.mask | 2 +- profiles/base/package.use.mask | 2 +- profiles/updates/4Q-2024 | 1 + sci-libs/mkl/mkl-2020.4.304.ebuild | 2 +- sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild | 2 +- sci-libs/mkl/mkl-2023.0.0.25398.ebuild | 2 +- sci-libs/mkl/mkl-2023.1.0.46342.ebuild | 2 +- sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild | 4 ++-- sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild | 4 ++-- sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild | 4 ++-- sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild | 4 ++-- sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild | 2 +- sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild | 2 +- sci-libs/rocFFT/rocFFT-6.1.1.ebuild | 2 +- sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild | 4 ++-- sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild | 2 +- sys-devel/clang-runtime/clang-runtime-17.0.6.ebuild | 2 +- sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild | 2 +- sys-devel/clang-runtime/clang-runtime-19.1.4.ebuild | 2 +- sys-devel/clang-runtime/clang-runtime-19.1.5.ebuild | 2 +- sys-devel/clang-runtime/clang-runtime-20.0.0.9999.ebuild | 2 +- .../clang-runtime/clang-runtime-20.0.0_pre20241207.ebuild | 2 +- sys-devel/clang-runtime/metadata.xml | 2 +- 56 files changed, 59 insertions(+), 58 deletions(-) rename {sys-libs/libomp => llvm-runtimes/openmp}/Manifest (100%) rename {sys-libs/libomp => llvm-runtimes/openmp}/metadata.xml (100%) rename sys-libs/libomp/libomp-15.0.7-r6.ebuild => llvm-runtimes/openmp/openmp-15.0.7-r6.ebuild (98%) rename sys-libs/libomp/libomp-16.0.6.ebuild => llvm-runtimes/openmp/openmp-16.0.6.ebuild (100%) rename sys-libs/libomp/libomp-17.0.6.ebuild => llvm-runtimes/openmp/openmp-17.0.6.ebuild (100%) rename sys-libs/libomp/libomp-18.1.8.ebuild => llvm-runtimes/openmp/openmp-18.1.8.ebuild (100%) rename sys-libs/libomp/libomp-19.1.4.ebuild => llvm-runtimes/openmp/openmp-19.1.4.ebuild (100%) rename sys-libs/libomp/libomp-19.1.5.ebuild => llvm-runtimes/openmp/openmp-19.1.5.ebuild (100%) rename sys-libs/libomp/libomp-20.0.0.9999.ebuild => llvm-runtimes/openmp/openmp-20.0.0.9999.ebuild (100%) rename sys-libs/libomp/libomp-20.0.0_pre20241207.ebuild => llvm-runtimes/openmp/openmp-20.0.0_pre20241207.ebuild (100%) diff --git a/app-portage/portage-utils/portage-utils-0.95-r1.ebuild b/app-portage/portage-utils/portage-utils-0.95-r1.ebuild index dcb7109115968..450e70106532c 100644 --- a/app-portage/portage-utils/portage-utils-0.95-r1.ebuild +++ b/app-portage/portage-utils/portage-utils-0.95-r1.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 @@ -23,7 +23,7 @@ IUSE="openmp +qmanifest +qtegrity static" RDEPEND=" openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) qmanifest? ( !static? ( diff --git a/app-portage/portage-utils/portage-utils-0.96-r1.ebuild b/app-portage/portage-utils/portage-utils-0.96-r1.ebuild index dcb7109115968..450e70106532c 100644 --- a/app-portage/portage-utils/portage-utils-0.96-r1.ebuild +++ b/app-portage/portage-utils/portage-utils-0.96-r1.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 @@ -23,7 +23,7 @@ IUSE="openmp +qmanifest +qtegrity static" RDEPEND=" openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) qmanifest? ( !static? ( diff --git a/app-portage/portage-utils/portage-utils-0.96.1.ebuild b/app-portage/portage-utils/portage-utils-0.96.1.ebuild index 486a560d9e144..b83ed0884c191 100644 --- a/app-portage/portage-utils/portage-utils-0.96.1.ebuild +++ b/app-portage/portage-utils/portage-utils-0.96.1.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 @@ -23,7 +23,7 @@ IUSE="openmp +qmanifest +qtegrity static" RDEPEND=" openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) qmanifest? ( !static? ( diff --git a/app-portage/portage-utils/portage-utils-0.97.ebuild b/app-portage/portage-utils/portage-utils-0.97.ebuild index b473205234543..494f66e8e8bf5 100644 --- a/app-portage/portage-utils/portage-utils-0.97.ebuild +++ b/app-portage/portage-utils/portage-utils-0.97.ebuild @@ -23,7 +23,7 @@ IUSE="openmp +qmanifest static" RDEPEND=" openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) qmanifest? ( !static? ( diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild index c202a4f58fecb..83f2812f8867e 100644 --- a/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/app-portage/portage-utils/portage-utils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ IUSE="openmp +qmanifest static" RDEPEND=" openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) qmanifest? ( !static? ( diff --git a/dev-cpp/eigen/eigen-3.4.0-r2.ebuild b/dev-cpp/eigen/eigen-3.4.0-r2.ebuild index 02a83d1063b81..0ac1611358378 100644 --- a/dev-cpp/eigen/eigen-3.4.0-r2.ebuild +++ b/dev-cpp/eigen/eigen-3.4.0-r2.ebuild @@ -133,7 +133,7 @@ DEPEND=" ) clang? ( sys-devel/clang[llvm_targets_NVPTX] - openmp? ( sys-libs/libomp[llvm_targets_NVPTX,offload] ) + openmp? ( llvm-runtimes/openmp[llvm_targets_NVPTX,offload] ) ) ) hip? ( dev-util/hip ) diff --git a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild index 528d62bcac2f8..770ef0673b7f4 100644 --- a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild +++ b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild @@ -138,7 +138,7 @@ DEPEND=" ) clang? ( sys-devel/clang[llvm_targets_NVPTX] - openmp? ( sys-libs/libomp[llvm_targets_NVPTX,offload] ) + openmp? ( llvm-runtimes/openmp[llvm_targets_NVPTX,offload] ) ) ) hip? ( dev-util/hip ) diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild index 6b434b04723c6..31c707c1ad4df 100644 --- a/dev-cpp/eigen/eigen-9999.ebuild +++ b/dev-cpp/eigen/eigen-9999.ebuild @@ -137,7 +137,7 @@ DEPEND=" ) clang? ( sys-devel/clang[llvm_targets_NVPTX] - openmp? ( sys-libs/libomp[llvm_targets_NVPTX,offload] ) + openmp? ( llvm-runtimes/openmp[llvm_targets_NVPTX,offload] ) ) ) hip? ( dev-util/hip ) diff --git a/dev-lang/souffle/souffle-2.4.1.ebuild b/dev-lang/souffle/souffle-2.4.1.ebuild index 9e2e1af841fc9..a6792c4f4c12b 100644 --- a/dev-lang/souffle/souffle-2.4.1.ebuild +++ b/dev-lang/souffle/souffle-2.4.1.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 @@ -34,7 +34,7 @@ RESTRICT="test" RDEPEND=" ffi? ( dev-libs/libffi:= ) ncurses? ( sys-libs/ncurses:= ) - openmp? ( sys-libs/libomp:= ) + openmp? ( llvm-runtimes/openmp:= ) python? ( ${PYTHON_DEPS} ) sqlite? ( dev-db/sqlite:3 ) swig? ( dev-lang/swig:= ) diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 478177de141e7..972c4ece7f5fd 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -672,7 +672,7 @@ tc-check-openmp() { if tc-is-gcc; then eerror "Enable OpenMP support by building sys-devel/gcc with USE=\"openmp\"." elif tc-is-clang; then - eerror "OpenMP support in sys-devel/clang is provided by sys-libs/libomp." + eerror "OpenMP support in sys-devel/clang is provided by llvm-runtimes/openmp." fi die "Active compiler does not have required support for OpenMP" diff --git a/llvm-runtimes/offload/offload-20.0.0.9999.ebuild b/llvm-runtimes/offload/offload-20.0.0.9999.ebuild index 1e9ec4ce3ce49..fb6d5a09981c5 100644 --- a/llvm-runtimes/offload/offload-20.0.0.9999.ebuild +++ b/llvm-runtimes/offload/offload-20.0.0.9999.ebuild @@ -17,7 +17,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-libs/libffi:= ~sys-devel/llvm-${PV} - ~sys-libs/libomp-${PV}[ompt?] + ~llvm-runtimes/openmp-${PV}[ompt?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) " DEPEND=" diff --git a/llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild b/llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild index adee1702c49a7..a92e9e17cebef 100644 --- a/llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild +++ b/llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild @@ -17,7 +17,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-libs/libffi:= ~sys-devel/llvm-${PV} - ~sys-libs/libomp-${PV}[ompt?] + ~llvm-runtimes/openmp-${PV}[ompt?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) " DEPEND=" diff --git a/sys-libs/libomp/Manifest b/llvm-runtimes/openmp/Manifest similarity index 100% rename from sys-libs/libomp/Manifest rename to llvm-runtimes/openmp/Manifest diff --git a/sys-libs/libomp/metadata.xml b/llvm-runtimes/openmp/metadata.xml similarity index 100% rename from sys-libs/libomp/metadata.xml rename to llvm-runtimes/openmp/metadata.xml diff --git a/sys-libs/libomp/libomp-15.0.7-r6.ebuild b/llvm-runtimes/openmp/openmp-15.0.7-r6.ebuild similarity index 98% rename from sys-libs/libomp/libomp-15.0.7-r6.ebuild rename to llvm-runtimes/openmp/openmp-15.0.7-r6.ebuild index ddef8e6ff939b..3abe51db096cc 100644 --- a/sys-libs/libomp/libomp-15.0.7-r6.ebuild +++ b/llvm-runtimes/openmp/openmp-15.0.7-r6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" diff --git a/sys-libs/libomp/libomp-16.0.6.ebuild b/llvm-runtimes/openmp/openmp-16.0.6.ebuild similarity index 100% rename from sys-libs/libomp/libomp-16.0.6.ebuild rename to llvm-runtimes/openmp/openmp-16.0.6.ebuild diff --git a/sys-libs/libomp/libomp-17.0.6.ebuild b/llvm-runtimes/openmp/openmp-17.0.6.ebuild similarity index 100% rename from sys-libs/libomp/libomp-17.0.6.ebuild rename to llvm-runtimes/openmp/openmp-17.0.6.ebuild diff --git a/sys-libs/libomp/libomp-18.1.8.ebuild b/llvm-runtimes/openmp/openmp-18.1.8.ebuild similarity index 100% rename from sys-libs/libomp/libomp-18.1.8.ebuild rename to llvm-runtimes/openmp/openmp-18.1.8.ebuild diff --git a/sys-libs/libomp/libomp-19.1.4.ebuild b/llvm-runtimes/openmp/openmp-19.1.4.ebuild similarity index 100% rename from sys-libs/libomp/libomp-19.1.4.ebuild rename to llvm-runtimes/openmp/openmp-19.1.4.ebuild diff --git a/sys-libs/libomp/libomp-19.1.5.ebuild b/llvm-runtimes/openmp/openmp-19.1.5.ebuild similarity index 100% rename from sys-libs/libomp/libomp-19.1.5.ebuild rename to llvm-runtimes/openmp/openmp-19.1.5.ebuild diff --git a/sys-libs/libomp/libomp-20.0.0.9999.ebuild b/llvm-runtimes/openmp/openmp-20.0.0.9999.ebuild similarity index 100% rename from sys-libs/libomp/libomp-20.0.0.9999.ebuild rename to llvm-runtimes/openmp/openmp-20.0.0.9999.ebuild diff --git a/sys-libs/libomp/libomp-20.0.0_pre20241207.ebuild b/llvm-runtimes/openmp/openmp-20.0.0_pre20241207.ebuild similarity index 100% rename from sys-libs/libomp/libomp-20.0.0_pre20241207.ebuild rename to llvm-runtimes/openmp/openmp-20.0.0_pre20241207.ebuild diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild index 139d3d762797d..10930b0a7498e 100644 --- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild +++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild @@ -33,7 +33,7 @@ RDEPEND=" >=media-libs/libmypaint-1.5.0[openmp?] media-libs/libpng:= sys-devel/gettext - sys-libs/libomp + llvm-runtimes/openmp x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 " diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild index 118c43243cc4f..849dfa35702be 100644 --- a/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild +++ b/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild @@ -56,7 +56,7 @@ RDEPEND=" opencl? ( virtual/opencl ) openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) ptex? ( media-libs/ptex ) tbb? ( dev-cpp/tbb:= ) diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild b/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild index 7c2bfcedf8c9c..c3631332c524a 100644 --- a/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild +++ b/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild @@ -53,7 +53,7 @@ RDEPEND=" opencl? ( virtual/opencl ) openmp? ( || ( sys-devel/gcc:*[openmp] - sys-libs/libomp + llvm-runtimes/openmp ) ) ptex? ( media-libs/ptex ) tbb? ( dev-cpp/tbb:= ) diff --git a/metadata/stabilization-groups/llvm.group b/metadata/stabilization-groups/llvm.group index 3c3e1acf51523..68c79531c78c0 100644 --- a/metadata/stabilization-groups/llvm.group +++ b/metadata/stabilization-groups/llvm.group @@ -5,6 +5,7 @@ dev-python/lit llvm-core/libclc llvm-runtimes/libunwind llvm-runtimes/offload +llvm-runtimes/openmp sys-devel/clang sys-devel/clang-common sys-devel/clang-runtime @@ -19,4 +20,3 @@ sys-libs/compiler-rt sys-libs/compiler-rt-sanitizers sys-libs/libcxx sys-libs/libcxxabi -sys-libs/libomp diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use index f9f1cac49c8ce..6b2d4c6a3f718 100644 --- a/profiles/arch/amd64/package.use +++ b/profiles/arch/amd64/package.use @@ -27,7 +27,7 @@ sys-apps/memtest86+ bios64 uefi64 sys-devel/clang-runtime abi_x86_32 sys-libs/libcxxabi abi_x86_32 sys-libs/libcxx abi_x86_32 -sys-libs/libomp abi_x86_32 +llvm-runtimes/openmp abi_x86_32 llvm-runtimes/libunwind abi_x86_32 # Mike Gilbert (2016-11-17) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index ab4369c02a603..bd113ace60ba0 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -186,11 +186,11 @@ dev-python/tables -cpudetection # Yiyang Wu (2023-01-27) # AMDGPU enablement depends on dev-libs/rocr-runtime, ~amd64 only # See also: https://bugs.gentoo.org/891499 -sys-libs/libomp -llvm_targets_AMDGPU +llvm-runtimes/openmp -llvm_targets_AMDGPU # Michał Górny (2023-01-24) # libomptarget is only supported on 64-bit architectures. ->=sys-libs/libomp-16.0.0_pre20230124 -offload +>=llvm-runtimes/openmp-16.0.0_pre20230124 -offload # Sam James (2022-12-11) # net-libs/rustls-ffi is keyworded here diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index e51faa8535fb1..92113854904c6 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -62,7 +62,7 @@ dev-python/nbval -doc # Yiyang Wu (2023-01-27) # AMDGPU enablement depends on dev-libs/rocr-runtime, ~amd64 only # See also: https://bugs.gentoo.org/891499 -sys-libs/libomp llvm_targets_AMDGPU +llvm-runtimes/openmp llvm_targets_AMDGPU # Sam James (2022-12-11) # net-libs/rustls-ffi is not yet marked stable diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index dcfc80695b9cd..b23403b308dd6 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -120,7 +120,7 @@ dev-lang/ruby -jit # Michał Górny (2023-01-24) # libomptarget is only supported on 64-bit architectures. ->=sys-libs/libomp-16.0.0_pre20230124 -offload +>=llvm-runtimes/openmp-16.0.0_pre20230124 -offload # Florian Schmaus (2022-11-23) # avoid larger deptree, bug #882593 diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 5cdc13f04e33b..c3283bd60a25b 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -159,7 +159,7 @@ dev-python/tables cpudetection # Michał Górny (2023-01-24) # libomptarget is only supported on 64-bit architectures. ->=sys-libs/libomp-16.0.0_pre20230124 offload +>=llvm-runtimes/openmp-16.0.0_pre20230124 offload # Sam James (2022-12-11) # Unkeyworded dependencies diff --git a/profiles/arch/powerpc/ppc32/package.mask b/profiles/arch/powerpc/ppc32/package.mask index 530aefd0b9d80..6e13258a705e2 100644 --- a/profiles/arch/powerpc/ppc32/package.mask +++ b/profiles/arch/powerpc/ppc32/package.mask @@ -6,8 +6,8 @@ >=dev-build/cmake-3.29 # Sam James (2024-03-23) -# sys-libs/libomp does not support ppc32 (bug #907213). -sys-libs/libomp +# llvm-runtimes/openmp does not support ppc32 (bug #907213). +llvm-runtimes/openmp # Sam James (2023-05-06) # Broken bundled Eigen, fails to compile. See bug #865191. diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask index f52785da45fa8..e5a15e8706a84 100644 --- a/profiles/arch/powerpc/ppc32/package.use.mask +++ b/profiles/arch/powerpc/ppc32/package.use.mask @@ -36,7 +36,7 @@ dev-qt/qtmultimedia:6 qml media-gfx/graphicsmagick jpeg2k # Sam James (2024-03-23) -# sys-libs/libomp does not support ppc32 (bug #907213). +# llvm-runtimes/openmp does not support ppc32 (bug #907213). sys-devel/clang-runtime openmp # Matt Jolly (2024-03-02) diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask index 48a6950381da9..b341f726f6b77 100644 --- a/profiles/arch/powerpc/ppc64/package.use.mask +++ b/profiles/arch/powerpc/ppc64/package.use.mask @@ -46,7 +46,7 @@ dev-python/nbval test # Michał Górny (2023-01-24) # libomptarget is only supported on 64-bit architectures. ->=sys-libs/libomp-16.0.0_pre20230124 -offload +>=llvm-runtimes/openmp-16.0.0_pre20230124 -offload # Niccolò Belli (2022-11-29) # media-libs/webrtc-audio-processing only has amd64, x86 and ppc64 keywords diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 265fce604406c..1e7bdf9f02bc8 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -338,7 +338,7 @@ sci-libs/vtk debug # Yiyang Wu (2023-01-27) # AMDGPU enablement depends on dev-libs/rocr-runtime, ~amd64 only # See also: https://bugs.gentoo.org/891499 -sys-libs/libomp llvm_targets_AMDGPU +llvm-runtimes/openmp llvm_targets_AMDGPU # Joonas Niilola (2023-01-08) # Doesn't compile currently, bug #853094. diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024 index fcd869890a895..dff1a5f8dbc7e 100644 --- a/profiles/updates/4Q-2024 +++ b/profiles/updates/4Q-2024 @@ -64,3 +64,4 @@ move dev-python/PyQt6 dev-python/pyqt6 move sys-libs/llvm-offload llvm-runtimes/offload move dev-libs/libclc llvm-core/libclc move sys-libs/llvm-libunwind llvm-runtimes/libunwind +move sys-libs/libomp llvm-runtimes/openmp diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild index b5764fafad095..45c317219bad6 100644 --- a/sci-libs/mkl/mkl-2020.4.304.ebuild +++ b/sci-libs/mkl/mkl-2020.4.304.ebuild @@ -27,7 +27,7 @@ RESTRICT="strip" RDEPEND=" app-eselect/eselect-blas app-eselect/eselect-lapack - sys-libs/libomp[${MULTILIB_USEDEP}] + llvm-runtimes/openmp[${MULTILIB_USEDEP}] " # bug #801460 BDEPEND="app-arch/xz-utils[extra-filters(+)]" diff --git a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild index 08673a4b52838..0695051cd353e 100644 --- a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild +++ b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" dev-cpp/tbb dev-libs/opencl-icd-loader sys-cluster/mpich - sys-libs/libomp + llvm-runtimes/openmp " # bug #801460 BDEPEND="app-arch/xz-utils[extra-filters(+)]" diff --git a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild index 55c1ca5a70c69..f81d3ce2ca915 100644 --- a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild +++ b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-cpp/tbb dev-libs/opencl-icd-loader sys-cluster/mpich - sys-libs/libomp + llvm-runtimes/openmp " # bug #801460 BDEPEND=" diff --git a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild index 024336ac92b80..cebe7dbfe4d38 100644 --- a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild +++ b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-cpp/tbb dev-libs/opencl-icd-loader sys-cluster/mpich[fortran] - sys-libs/libomp + llvm-runtimes/openmp " # bug #801460 BDEPEND=" diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild index f8c6fd2a13673..a77c621f57cea 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild @@ -33,11 +33,11 @@ DEPEND=" test? ( virtual/blas dev-cpp/gtest - sys-libs/libomp + llvm-runtimes/openmp ) benchmark? ( virtual/blas - sys-libs/libomp + llvm-runtimes/openmp ) " diff --git a/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild index cc410094094f2..9050d13eb3121 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild @@ -33,11 +33,11 @@ DEPEND=" test? ( virtual/blas dev-cpp/gtest - sys-libs/libomp + llvm-runtimes/openmp ) benchmark? ( virtual/blas - sys-libs/libomp + llvm-runtimes/openmp ) " diff --git a/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild index ed39ae5207d87..80644ab20db8e 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.7.1-r2.ebuild @@ -34,11 +34,11 @@ DEPEND=" test? ( virtual/blas dev-cpp/gtest - sys-libs/libomp + llvm-runtimes/openmp ) benchmark? ( virtual/blas - sys-libs/libomp + llvm-runtimes/openmp ) " diff --git a/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild index a8f1f55aefba3..b101aed6dee72 100644 --- a/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild @@ -37,11 +37,11 @@ DEPEND=" test? ( virtual/blas dev-cpp/gtest - sys-libs/libomp + llvm-runtimes/openmp ) benchmark? ( virtual/blas - sys-libs/libomp + llvm-runtimes/openmp ) " diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild index 60110fcd62fc6..7b75953d510f4 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild @@ -34,7 +34,7 @@ DEPEND="dev-util/hip BDEPEND=" test? ( dev-cpp/gtest dev-libs/boost - >=sci-libs/fftw-3 sys-libs/libomp ) + >=sci-libs/fftw-3 llvm-runtimes/openmp ) >=dev-build/cmake-3.22 dev-build/rocm-cmake " diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild index f4ddb494bf358..0c383fa011640 100644 --- a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild @@ -39,7 +39,7 @@ DEPEND="=dev-util/hip-5* dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 - sys-libs/libomp + llvm-runtimes/openmp sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] ) " diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild index 99709902c496f..d1289f597217c 100644 --- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild +++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild @@ -40,7 +40,7 @@ DEPEND="=dev-util/hip-6* dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 - sys-libs/libomp + llvm-runtimes/openmp sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] ) " diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild index c4f7620e1212e..c80214039ada7 100644 --- a/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-15.0.7.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 @@ -22,5 +22,5 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] ) " diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild index 25889f60d661c..c175cf8f6d82d 100644 --- a/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild @@ -22,7 +22,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.6.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.6.ebuild index 25889f60d661c..c175cf8f6d82d 100644 --- a/sys-devel/clang-runtime/clang-runtime-17.0.6.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-17.0.6.ebuild @@ -22,7 +22,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild b/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild index e95d8a0af7dc8..b8e570778a41a 100644 --- a/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild @@ -22,7 +22,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-19.1.4.ebuild b/sys-devel/clang-runtime/clang-runtime-19.1.4.ebuild index e95d8a0af7dc8..b8e570778a41a 100644 --- a/sys-devel/clang-runtime/clang-runtime-19.1.4.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-19.1.4.ebuild @@ -22,7 +22,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-19.1.5.ebuild b/sys-devel/clang-runtime/clang-runtime-19.1.5.ebuild index 8ded193c919c3..23682d8dbe5d6 100644 --- a/sys-devel/clang-runtime/clang-runtime-19.1.5.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-19.1.5.ebuild @@ -22,7 +22,7 @@ RDEPEND=" ) ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] ) " pkg_pretend() { diff --git a/sys-devel/clang-runtime/clang-runtime-20.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-20.0.0.9999.ebuild index 88cc488d44f59..5096eef102397 100644 --- a/sys-devel/clang-runtime/clang-runtime-20.0.0.9999.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-20.0.0.9999.ebuild @@ -22,7 +22,7 @@ RDEPEND=" ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) openmp? ( - >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] + >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] offload? ( >=llvm-runtimes/offload-${PV} ) diff --git a/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20241207.ebuild b/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20241207.ebuild index 88cc488d44f59..5096eef102397 100644 --- a/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20241207.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20241207.ebuild @@ -22,7 +22,7 @@ RDEPEND=" ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) openmp? ( - >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] + >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] offload? ( >=llvm-runtimes/offload-${PV} ) diff --git a/sys-devel/clang-runtime/metadata.xml b/sys-devel/clang-runtime/metadata.xml index 91a68054aec8f..1339c7657454a 100644 --- a/sys-devel/clang-runtime/metadata.xml +++ b/sys-devel/clang-runtime/metadata.xml @@ -8,7 +8,7 @@ Install sys-libs/compiler-rt for -rtlib=compiler-rt Install sys-libs/libcxx for -stdlib=libc++ Install llvm-runtimes/offload for -fopenmp GPU offloading - Install sys-libs/libomp for -fopenmp support + Install llvm-runtimes/openmp for -fopenmp support Enable compiler-rt sanitizer (-fsanitize*) support