[gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-clang-ocl/files/, dev-util/rocm-clang-ocl/, profiles/

2023-03-04 Thread Andreas Sturmlechner 
commit: fc3c7a1d498f0870d22f721c107e146cc01ade25
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar  4 14:00:22 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar  4 14:00:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3c7a1d

dev-util/rocm-clang-ocl: Remove last-rited package

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/rocm-clang-ocl/Manifest   |  1 -
 .../files/rocm-clang-ocl-5.0.2-system-llvm.patch   | 17 
 dev-util/rocm-clang-ocl/metadata.xml   | 15 --
 .../rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild  | 32 --
 profiles/package.mask  |  5 
 5 files changed, 70 deletions(-)

diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
deleted file mode 100644
index 827fc6d22060..
--- a/dev-util/rocm-clang-ocl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rocm-clang-ocl-5.0.2.tar.gz 3908 BLAKE2B 
b348c047d2dcea9524847cbb44d37e56c16fa05d5ab7f1b798e22c1f3d61b38aa725436f3ef44491898f4afd675716036efaf3959cac310b2905a2d16fc6e911
 SHA512 
582b9ff425c1f9ff4fb32cf7b64c8357f8f585ab75b31b63cfa8705725f823cd0cc60f0d0a641f66c6760d8a5378444f29f3f57b8989d36f4fd32bb7b397d167

diff --git 
a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch 
b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
deleted file mode 100644
index 5f052f4282e0..
--- a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Use system clang.
-
-Forwarded: not yet.
-
-Index: clang-ocl-rocm-5.0.2/CMakeLists.txt
-===
 clang-ocl-rocm-5.0.2.orig/CMakeLists.txt
-+++ clang-ocl-rocm-5.0.2/CMakeLists.txt
-@@ -20,7 +20,7 @@ if(hcc_FOUND)
- set(CLANG_BIN "${hcc_LIB_INSTALL_DIR}/../bin" CACHE STRING "")
- set(BITCODE_DIR "${hcc_LIB_INSTALL_DIR}" CACHE STRING "")
- else()
--find_program(CLANG_EXE NAMES clang HINTS ${CXX_COMPILER_PATH}/bin PATHS 
/opt/rocm/llvm/bin)
-+find_program(CLANG_EXE NAMES clang)
- get_filename_component(CLANG_EXE_DIR ${CLANG_EXE} DIRECTORY)
- find_package(AMDDeviceLibs PATHS /opt/rocm)
- set(CLANG_BIN "${CLANG_EXE_DIR}" CACHE STRING "")

diff --git a/dev-util/rocm-clang-ocl/metadata.xml 
b/dev-util/rocm-clang-ocl/metadata.xml
deleted file mode 100644
index e74d41fd607c..
--- a/dev-util/rocm-clang-ocl/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-s...@gentoo.org
-  
-  
-gen...@holzke.net
-Wilfried Holzke
-  
-  
-xgreenlandfor...@gmail.com
-Yiyang Wu
-  
-

diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild 
b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
deleted file mode 100644
index 40be9d9dd7df..
--- a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="OpenCL compilation with clang compiler"
-HOMEPAGE="https://github.com/RadeonOpenCompute/clang-ocl.git;
-SRC_URI="https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-${PV}.tar.gz
 -> rocm-clang-ocl-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/rocm-opencl-runtime:${SLOT}"
-DEPEND="
-   dev-util/rocm-cmake:${SLOT}
-   ${RDEPEND}"
-
-S="${WORKDIR}/clang-ocl-rocm-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.0.2-system-llvm.patch )
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed \
-   -e "/AMDDeviceLibs 
PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
-   -e 
"s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:"
 \
-   -i CMakeLists.txt || die
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index bba04bfa7b53..43ca2174cb77 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -298,11 +298,6 @@ dev-python/sphinxcontrib-blockdiag
 # Removal on 2023-03-03.  Bug #892854.
 dev-python/berkeleydb
 
-# Andreas Sturmlechner  (2023-02-01)
-# >=5.1 series uses vanilla llvm/clang instead of forked versions.
-# Removal on 2023-03-02
-dev-util/rocm-clang-ocl
-
 # Michał Górny  (2023-01-31)
 # No tests, no activity since Aug 2020, no reverse dependencies.
 # Removal on 2023-03-02.  Bug #892744.

[gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-clang-ocl/

2022-12-19 Thread Andreas Sturmlechner 
commit: 44c637c6e4bd118e7b4769bfae687bf646d74766
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 19 08:03:08 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 19 14:00:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c637c6

dev-util/rocm-clang-ocl: drop 4.3.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/rocm-clang-ocl/Manifest   |  1 -
 .../rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild | 31 --
 2 files changed, 32 deletions(-)

diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
index 397d1ebb486c..827fc6d22060 100644
--- a/dev-util/rocm-clang-ocl/Manifest
+++ b/dev-util/rocm-clang-ocl/Manifest
@@ -1,2 +1 @@
-DIST rocm-clang-ocl-4.3.0.tar.gz 3241 BLAKE2B 
1a646d64e42a8884a7714b4ca25d888aa1e84d68be3f6ceacefcf7836340133740c8df85f152fadb40d463af76eb659f0fd11ebd2b0a6a3c0da3b7ac64bf541c
 SHA512 
059d0d118205d6f4c2a61222fc74709a86bbe71687615debcc1698f73c28a769379b909cd18742b4d3340ba30a65b02da9224fbe5fe0e2fb005d9a45f22dfe9c
 DIST rocm-clang-ocl-5.0.2.tar.gz 3908 BLAKE2B 
b348c047d2dcea9524847cbb44d37e56c16fa05d5ab7f1b798e22c1f3d61b38aa725436f3ef44491898f4afd675716036efaf3959cac310b2905a2d16fc6e911
 SHA512 
582b9ff425c1f9ff4fb32cf7b64c8357f8f585ab75b31b63cfa8705725f823cd0cc60f0d0a641f66c6760d8a5378444f29f3f57b8989d36f4fd32bb7b397d167

diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild 
b/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild
deleted file mode 100644
index 4c12bb9c3831..
--- a/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="OpenCL compilation with clang compiler"
-HOMEPAGE="https://github.com/RadeonOpenCompute/clang-ocl.git;
-SRC_URI="https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-${PV}.tar.gz
 -> rocm-clang-ocl-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/rocm-opencl-runtime:${SLOT}"
-DEPEND="
-   dev-util/rocm-cmake:${SLOT}
-   ${RDEPEND}"
-
-S="${WORKDIR}/clang-ocl-rocm-${PV}"
-
-src_prepare() {
-   sed -e "s:HINTS \${CXX_COMPILER_PATH}/bin:NO_DEFAULT_PATH:" \
-   -e "s:/opt/rocm/llvm/bin:${EPREFIX}/usr/lib/llvm/roc/bin:" \
-   -e "/AMDDeviceLibs 
PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
-   -e 
"s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:"
 \
-   -i CMakeLists.txt || die
-
-   cmake_src_prepare
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-clang-ocl/, dev-util/rocm-clang-ocl/files/

2022-08-06 Thread Benda XU 
commit: 8a64d9b3fa74ab7ee3ec9b4d85f813d63648a130
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Aug  6 13:47:56 2022 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Aug  6 14:22:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a64d9b3

dev-util/rocm-clang-ocl: use system clang.

Bug: https://bugs.gentoo.org/851702
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Benda Xu  gentoo.org>

 .../files/rocm-clang-ocl-5.0.2-system-llvm.patch| 17 +
 ...-ocl-5.0.2.ebuild => rocm-clang-ocl-5.0.2-r1.ebuild} |  9 +
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git 
a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch 
b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
new file mode 100644
index ..5f052f4282e0
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
@@ -0,0 +1,17 @@
+Use system clang.
+
+Forwarded: not yet.
+
+Index: clang-ocl-rocm-5.0.2/CMakeLists.txt
+===
+--- clang-ocl-rocm-5.0.2.orig/CMakeLists.txt
 clang-ocl-rocm-5.0.2/CMakeLists.txt
+@@ -20,7 +20,7 @@ if(hcc_FOUND)
+ set(CLANG_BIN "${hcc_LIB_INSTALL_DIR}/../bin" CACHE STRING "")
+ set(BITCODE_DIR "${hcc_LIB_INSTALL_DIR}" CACHE STRING "")
+ else()
+-find_program(CLANG_EXE NAMES clang HINTS ${CXX_COMPILER_PATH}/bin PATHS 
/opt/rocm/llvm/bin)
++find_program(CLANG_EXE NAMES clang)
+ get_filename_component(CLANG_EXE_DIR ${CLANG_EXE} DIRECTORY)
+ find_package(AMDDeviceLibs PATHS /opt/rocm)
+ set(CLANG_BIN "${CLANG_EXE_DIR}" CACHE STRING "")

diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild 
b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
similarity index 86%
rename from dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild
rename to dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
index 202836d1adbe..40be9d9dd7df 100644
--- a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild
+++ b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
@@ -20,12 +20,13 @@ DEPEND="
 
 S="${WORKDIR}/clang-ocl-rocm-${PV}"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.0.2-system-llvm.patch )
+
 src_prepare() {
-   sed -e "s:HINTS \${CXX_COMPILER_PATH}/bin:NO_DEFAULT_PATH:" \
-   -e "s:/opt/rocm/llvm/bin:${EPREFIX}/usr/lib/llvm/roc/bin:" \
+   cmake_src_prepare
+
+   sed \
-e "/AMDDeviceLibs 
PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
-e 
"s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:"
 \
-i CMakeLists.txt || die
-
-   cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-clang-ocl/

2022-06-11 Thread Benda XU 
commit: f9870b064f3eb1119e4d7ffaa3d05cd692002a3f
Author: Yiyang Wu  gmail  com>
AuthorDate: Sat Jun 11 08:16:08 2022 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Jun 11 13:54:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9870b06

dev-util/rocm-clang-ocl: add 5.0.2

Bug: https://github.com/gentoo/gentoo/pull/25851
Signed-off-by: Yiyang Wu  gmail.com>
Signed-off-by: Benda Xu  gentoo.org>

 dev-util/rocm-clang-ocl/Manifest   |  1 +
 .../rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild | 31 ++
 2 files changed, 32 insertions(+)

diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
index 6241ed5c05ca..397d1ebb486c 100644
--- a/dev-util/rocm-clang-ocl/Manifest
+++ b/dev-util/rocm-clang-ocl/Manifest
@@ -1 +1,2 @@
 DIST rocm-clang-ocl-4.3.0.tar.gz 3241 BLAKE2B 
1a646d64e42a8884a7714b4ca25d888aa1e84d68be3f6ceacefcf7836340133740c8df85f152fadb40d463af76eb659f0fd11ebd2b0a6a3c0da3b7ac64bf541c
 SHA512 
059d0d118205d6f4c2a61222fc74709a86bbe71687615debcc1698f73c28a769379b909cd18742b4d3340ba30a65b02da9224fbe5fe0e2fb005d9a45f22dfe9c
+DIST rocm-clang-ocl-5.0.2.tar.gz 3908 BLAKE2B 
b348c047d2dcea9524847cbb44d37e56c16fa05d5ab7f1b798e22c1f3d61b38aa725436f3ef44491898f4afd675716036efaf3959cac310b2905a2d16fc6e911
 SHA512 
582b9ff425c1f9ff4fb32cf7b64c8357f8f585ab75b31b63cfa8705725f823cd0cc60f0d0a641f66c6760d8a5378444f29f3f57b8989d36f4fd32bb7b397d167

diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild 
b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild
new file mode 100644
index ..202836d1adbe
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="OpenCL compilation with clang compiler"
+HOMEPAGE="https://github.com/RadeonOpenCompute/clang-ocl.git;
+SRC_URI="https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-${PV}.tar.gz
 -> rocm-clang-ocl-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocm-opencl-runtime:${SLOT}"
+DEPEND="
+   dev-util/rocm-cmake:${SLOT}
+   ${RDEPEND}"
+
+S="${WORKDIR}/clang-ocl-rocm-${PV}"
+
+src_prepare() {
+   sed -e "s:HINTS \${CXX_COMPILER_PATH}/bin:NO_DEFAULT_PATH:" \
+   -e "s:/opt/rocm/llvm/bin:${EPREFIX}/usr/lib/llvm/roc/bin:" \
+   -e "/AMDDeviceLibs 
PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
+   -e 
"s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:"
 \
+   -i CMakeLists.txt || die
+
+   cmake_src_prepare
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-clang-ocl/

2021-11-06 Thread Benda XU 
commit: 44b9b2de4f574153ce5e5f600f369e4f08c1cbaf
Author: YiyangWu  gmail  com>
AuthorDate: Thu Aug 26 07:50:33 2021 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Nov  6 16:58:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b9b2de

dev-util/rocm-clang-ocl: OpenCL compilation with clang compiler.

This small package migrated from science overlay is the dependency
of sci-libs/MIOpen (currently in ::science; prepared for ::gentoo)

Closes: https://github.com/gentoo/gentoo/pull/22824
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Yiyang Wu  gmail.com>
Signed-off-by: Benda Xu  gentoo.org>

 dev-util/rocm-clang-ocl/Manifest   |  1 +
 dev-util/rocm-clang-ocl/metadata.xml   | 15 +++
 .../rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild | 31 ++
 3 files changed, 47 insertions(+)

diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
new file mode 100644
index 000..6241ed5c05c
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/Manifest
@@ -0,0 +1 @@
+DIST rocm-clang-ocl-4.3.0.tar.gz 3241 BLAKE2B 
1a646d64e42a8884a7714b4ca25d888aa1e84d68be3f6ceacefcf7836340133740c8df85f152fadb40d463af76eb659f0fd11ebd2b0a6a3c0da3b7ac64bf541c
 SHA512 
059d0d118205d6f4c2a61222fc74709a86bbe71687615debcc1698f73c28a769379b909cd18742b4d3340ba30a65b02da9224fbe5fe0e2fb005d9a45f22dfe9c

diff --git a/dev-util/rocm-clang-ocl/metadata.xml 
b/dev-util/rocm-clang-ocl/metadata.xml
new file mode 100644
index 000..da47ad0ef39
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd'>
+
+  
+s...@gentoo.org
+  
+  
+gen...@holzke.net
+Wilfried Holzke
+  
+  
+xgreenlandfor...@gmail.com
+Yiyang Wu
+  
+

diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild 
b/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild
new file mode 100644
index 000..4c12bb9c383
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="OpenCL compilation with clang compiler"
+HOMEPAGE="https://github.com/RadeonOpenCompute/clang-ocl.git;
+SRC_URI="https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-${PV}.tar.gz
 -> rocm-clang-ocl-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocm-opencl-runtime:${SLOT}"
+DEPEND="
+   dev-util/rocm-cmake:${SLOT}
+   ${RDEPEND}"
+
+S="${WORKDIR}/clang-ocl-rocm-${PV}"
+
+src_prepare() {
+   sed -e "s:HINTS \${CXX_COMPILER_PATH}/bin:NO_DEFAULT_PATH:" \
+   -e "s:/opt/rocm/llvm/bin:${EPREFIX}/usr/lib/llvm/roc/bin:" \
+   -e "/AMDDeviceLibs 
PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
+   -e 
"s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:"
 \
+   -i CMakeLists.txt || die
+
+   cmake_src_prepare
+}