commit:     6320bf1752822040277b09a8e5fd7360cc0083dd
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Fri Jan 27 12:49:18 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 11:08:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6320bf17

sys-libs/libomp: AMDGPU offload depend on rocr-runtime

The package has a semi-automagic dependency on rocr-runtime.  If it is
installed at build time, it links to it.  If it is not, it loads it
dynamically at runtime.  In either case, the library is needed
for offloading to work.

Closes: https://bugs.gentoo.org/835095
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29298
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 profiles/arch/amd64/package.use.mask                              | 5 +++++
 profiles/arch/amd64/package.use.stable.mask                       | 7 ++++++-
 profiles/base/package.use.mask                                    | 5 +++++
 sys-libs/libomp/{libomp-15.0.7.ebuild => libomp-15.0.7-r1.ebuild} | 1 +
 sys-libs/libomp/libomp-16.0.0.9999.ebuild                         | 1 +
 sys-libs/libomp/libomp-16.0.0_rc2.ebuild                          | 1 +
 sys-libs/libomp/libomp-17.0.0.9999.ebuild                         | 1 +
 sys-libs/libomp/libomp-17.0.0_pre20230211.ebuild                  | 1 +
 8 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index 7e4569ff152b..25d755018798 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Yiyang Wu <[email protected]> (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
+
 # Michał Górny <[email protected]> (2023-01-24)
 # libomptarget is only supported on 64-bit architectures.
 >=sys-libs/libomp-16.0.0_pre20230124 -offload

diff --git a/profiles/arch/amd64/package.use.stable.mask 
b/profiles/arch/amd64/package.use.stable.mask
index 06a6b1164832..cceeacd6c034 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Yiyang Wu <[email protected]> (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
+
 # Sam James <[email protected]> (2022-12-11)
 # net-libs/rustls-ffi is not yet marked stable
 net-misc/curl rustls curl_ssl_rustls

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index c9443c84db66..134e90a48afa 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -12,6 +12,11 @@
 # https://github.com/gentoo/gentoo/pull/29236#issuecomment-1407373536
 sci-libs/vtk debug
 
+# Yiyang Wu <[email protected]> (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
+
 # Michał Górny <[email protected]> (2023-01-21)
 # media-libs/libextractor is masked for removal.
 media-plugins/vdr-xineliboutput libextractor

diff --git a/sys-libs/libomp/libomp-15.0.7.ebuild 
b/sys-libs/libomp/libomp-15.0.7-r1.ebuild
similarity index 98%
rename from sys-libs/libomp/libomp-15.0.7.ebuild
rename to sys-libs/libomp/libomp-15.0.7-r1.ebuild
index 46dfae21f41d..d8a7919e54a4 100644
--- a/sys-libs/libomp/libomp-15.0.7.ebuild
+++ b/sys-libs/libomp/libomp-15.0.7-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
                virtual/libelf:=[${MULTILIB_USEDEP}]
                dev-libs/libffi:=[${MULTILIB_USEDEP}]
                ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+               llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
        )
 "
 # tests:

diff --git a/sys-libs/libomp/libomp-16.0.0.9999.ebuild 
b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
index 971931877b19..6bb50cb9edf9 100644
--- a/sys-libs/libomp/libomp-16.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
        offload? (
                dev-libs/libffi:=[${MULTILIB_USEDEP}]
                ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+               llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
        )
 "
 # tests:

diff --git a/sys-libs/libomp/libomp-16.0.0_rc2.ebuild 
b/sys-libs/libomp/libomp-16.0.0_rc2.ebuild
index da09c73e8a26..ebf0c81b440e 100644
--- a/sys-libs/libomp/libomp-16.0.0_rc2.ebuild
+++ b/sys-libs/libomp/libomp-16.0.0_rc2.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
        offload? (
                dev-libs/libffi:=[${MULTILIB_USEDEP}]
                ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+               llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
        )
 "
 # tests:

diff --git a/sys-libs/libomp/libomp-17.0.0.9999.ebuild 
b/sys-libs/libomp/libomp-17.0.0.9999.ebuild
index 971931877b19..6bb50cb9edf9 100644
--- a/sys-libs/libomp/libomp-17.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-17.0.0.9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
        offload? (
                dev-libs/libffi:=[${MULTILIB_USEDEP}]
                ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+               llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
        )
 "
 # tests:

diff --git a/sys-libs/libomp/libomp-17.0.0_pre20230211.ebuild 
b/sys-libs/libomp/libomp-17.0.0_pre20230211.ebuild
index 971931877b19..6bb50cb9edf9 100644
--- a/sys-libs/libomp/libomp-17.0.0_pre20230211.ebuild
+++ b/sys-libs/libomp/libomp-17.0.0_pre20230211.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
        offload? (
                dev-libs/libffi:=[${MULTILIB_USEDEP}]
                ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+               llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
        )
 "
 # tests:

Reply via email to