commit:     d63a56ead059b304497a936c3602e5553a01188c
Author:     YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Sun Feb 20 06:57:58 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 04:09:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63a56ea

dev-libs/rocm-comgr: bump version to 5.0.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-libs/rocm-comgr/Manifest                       |  1 +
 .../files/rocm-comgr-5.0-rocm_path.patch           | 14 ++++++
 dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild        | 50 ++++++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 529fb368e822..37fa70a1b490 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -5,3 +5,4 @@ DIST rocm-comgr-4.1.0.tar.gz 101923 BLAKE2B 
227317d3c96d577ff2df352721e3ffcf75e2
 DIST rocm-comgr-4.2.0.tar.gz 101877 BLAKE2B 
6796ab4fc7139224af9e26f6adc5ac3ef260b36d125517766bc4adf3dd819709e5aa816680ae073f00db635d15d2a3bde7bfc69bdfbea0f49453f75930fae90d
 SHA512 
dffc00d166eb060c6cf848878cc6c7fc63858168cd20b5f22df2b7cbf3ac7a3253fbab5df4df055823028a06c3dca3e3f379246305ae9872eb94bcdbd30dd602
 DIST rocm-comgr-4.3.0.tar.gz 106250 BLAKE2B 
40a3a69147ae4fc96d3713331d35ae65d952dbf92fb3c92bee75bbef394342b11f383cb51c6def85c256326905c5067b1da816e853f793fd3c40a5af9a6e0122
 SHA512 
5961720bdc78c6d3fc626bd83f52be0aa32b01178bf4db0a503a0639fe05c5c589b7feb2dcbeb78021d36a40ac6f936cb1262cd5ab5cda4689e8e642ab7eddc3
 DIST rocm-comgr-4.5.2.tar.gz 108521 BLAKE2B 
9fe238a17bac5739d2d103d859a8dd16cb95d0333f9f85e7fd94463c4ee8bd88801b7b1d1278d978fda7425f391de5e9043a3539583ed3b8d45393a613c19bba
 SHA512 
c466a9bb1b725b79d056673824c6dd79919866f42db88b611e4ac24b0624b12c078affe8bfc7ad7c1373ce0ca60607904c46f13751b47c9f4deaf4105e2c7cd3
+DIST rocm-comgr-5.0.2.tar.gz 117092 BLAKE2B 
1ffcb74f9716a8f050d722f569cced66e8e9fa5a23a7156edd1b4dfd7dd7b09a175f3555bbf29ef452d7e4371f65ebe4c6fac30c583468a5563dd59fa92b53e4
 SHA512 
d2cf4517fc1da1adc367aaa6f53cc099547a931be30cc261d68c8174a5a9ffe3af937fbb298987abbdd7fd5d80364bef6ea9112dcaaf326a410fdd215e568f2f

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch 
b/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch
new file mode 100644
index 000000000000..6e908847a54f
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch
@@ -0,0 +1,14 @@
+Index: comgr/src/comgr-env.cpp
+===================================================================
+--- comgr.orig/src/comgr-env.cpp
++++ comgr/src/comgr-env.cpp
+@@ -247,6 +247,9 @@ InstallationDetector *getDetectorImpl()
+   if (EnvROCMPath) {
+     ROCmInstallPath = EnvROCMPath;
+   }
++  else {
++      ROCmInstallPath = "@GENTOO_PORTAGE_EPREFIX@/usr";
++  }
+ 
+   InstallationDetector *Detector;
+   if (ROCmInstallPath == "") {

diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild 
b/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild
new file mode 100644
index 000000000000..e7ed23e8d3a5
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake prefix
+
+if [[ ${PV} == *9999 ]] ; then
+       
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/";
+       inherit git-r3
+       S="${WORKDIR}/${P}/lib/comgr"
+else
+       
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz
 -> ${P}.tar.gz"
+       S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
+       KEYWORDS="~amd64"
+fi
+
+PATCHES=(
+       "${FILESDIR}/${PN}-4.5.2-dependencies.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport";
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+       >=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+       sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
+       sed '/sys::path::append(LLVMPath/s,"llvm","lib/llvm/roc",' -i 
src/comgr-env.cpp || die
+       sed '/Args.push_back(HIPIncludePath/,+1d' -i src/comgr-compiler.cpp || 
die
+       sed '/Args.push_back(ROCMIncludePath/,+1d' -i src/comgr-compiler.cpp || 
die # ROCM and HIPIncludePath is now /usr, which disturb the include order
+       eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
+       cmake_src_prepare
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
+               -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+               -DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
+               -DCMAKE_STRIP=""  # disable stripping defined at 
lib/comgr/CMakeLists.txt:58
+       )
+       cmake_src_configure
+}

Reply via email to