commit: d4951c0280c685dcf18e404f82b20c07ff2e4010
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 19:52:34 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 19:54:04 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d4951c02
dev-libs/oneCCL: use DPC++ compiler
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-libs/oneCCL/metadata.xml | 6 +++---
.../{oneCCL-2021.7.1.ebuild => oneCCL-2021.7.1-r1.ebuild} | 12 +++++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dev-libs/oneCCL/metadata.xml b/dev-libs/oneCCL/metadata.xml
index ad55412d9..cbb320b12 100644
--- a/dev-libs/oneCCL/metadata.xml
+++ b/dev-libs/oneCCL/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>[email protected]</email>
- <name>Andrew Ammerlaan</name>
+ <maintainer type="project">
+ <email>[email protected]</email>
+ <name>Gentoo Science Project</name>
</maintainer>
<upstream>
<remote-id type="github">oneapi-src/oneCCL</remote-id>
diff --git a/dev-libs/oneCCL/oneCCL-2021.7.1.ebuild
b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
similarity index 82%
rename from dev-libs/oneCCL/oneCCL-2021.7.1.ebuild
rename to dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
index ae069bb2a..b9c1fda6b 100644
--- a/dev-libs/oneCCL/oneCCL-2021.7.1.ebuild
+++ b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
@@ -15,10 +15,12 @@ KEYWORDS="~amd64"
IUSE="mpi"
+BDEPEND="sys-devel/DPC++"
+
DEPEND="
- dev-libs/level-zero
- sys-apps/hwloc
- sys-block/libfabric
+ dev-libs/level-zero:=
+ sys-apps/hwloc:=
+ sys-block/libfabric:=
mpi? ( virtual/mpi )
"
RDEPEND="${DEPEND}"
@@ -34,6 +36,9 @@ src_prepare() {
# Use system libs instead
rm -r deps/hwloc deps/level_zero deps/mpi deps/ofi || die
+ # DPC++ compiler required for full functionality
+ export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang"
+
cmake_src_prepare
}
@@ -49,6 +54,7 @@ src_configure() {
-DENABLE_MPI="$(usex mpi)"
# Use system fabric
-DLIBFABRIC_DIR="${ESYSROOT}/usr"
+ # TODO: Unbundle ITT
)
cmake_src_configure
}