gentoo auto-resync : 05:03:2025 - 01:46:50

2 files changed, 92 insertions, 0 deletions

diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index d4a75e22b90b..48411767d5d3 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -22,9 +22,11 @@ AUX rocm-comgr-6.3.2-rocm_path.patch 419 BLAKE2B f6fa0d84b91811f8aa70bdbce429f66
 DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
 DIST llvm-project-rocm-6.3.2.tar.gz 206671202 BLAKE2B a280e2be22b8eb9fd51814074447baed3637231d4bfbe391047a1fb2409197c8d8ba58cebb3aeaec15aa4daee9371311274b30ede48e0039d7c84e432b15de1a SHA512 314e27577af76268635f3c96ee3516829e4622913c3d0c4c68eccbaee0c9f7f5fc031cbd35827deb4bc29712592c424e296c15ce8c500c897bfb3eb19455899c
+DIST llvm-project-rocm-6.3.3.tar.gz 206663912 BLAKE2B 939527dbbcd0c4b4785e5cdbd7144149f169120506c2b5b00e84e8208e3877109e24cf58501a1317d1f9dcce0614cf47a0290cb2e0e10aa7b164bcb064c2ffbc SHA512 380d6ca72dd215b1996b14fe9b54f4981bd1d275aae22ed89f4f3efc46ec2988054cc98dcc45e1c678812c2bd3488ed6cf375ca193af4ad272a6cff7f2388872
 DIST rocm-comgr-5.7.1.tar.gz 137923 BLAKE2B e215f51137fd0c4b67e85496bf289dc0afde6ebc9efb9416f5fc4cf312b2be9be26da35cb70965bf4857a0f1434d750bcc03ce83095173098487ef7805948735 SHA512 cdd2609b858d9503c30122a2d328d36baa8a930a05bcb6c38e30723909c492b4d47eaaf4884dbb7aa82053e7cda6c22ee1aa16fc5ba266e272d98ff772c5079d
 EBUILD rocm-comgr-5.7.1.ebuild 2059 BLAKE2B a366eb8aab05055bd05c520551d1e3c6670f1330283730a9656c7f02b49543be812af2797c2bdae2c7fae143a203a28563b8dc34a24c481024ee27ce70bbd752 SHA512 f80ba6b4241fc972d7efe2611ecc705145a14d6254a80a19e416d43a7c5b17b7f35492f288665c370143ef7aa28f70eaeb394d20897e44d8ad3ad1d0e8232b3f
 EBUILD rocm-comgr-6.1.1.ebuild 2403 BLAKE2B b19d984c535a3fa4df5f1af1a5fc26b9c9f00c2347ac3dcc0faea4be30cd11bf8f3984d7afcb0709a32d4897e825cbbf714accd04e2be33eb12627e8e80f3309 SHA512 4d340d46831c089e2b9f9d1d44e0b1d2a0cd020cb50eed8589a5f745ec5c806b9ff65d0751b7439366135cc3bb801d725586e4f285ec27b24e90cac69383cd3a
 EBUILD rocm-comgr-6.1.2.ebuild 2403 BLAKE2B b19d984c535a3fa4df5f1af1a5fc26b9c9f00c2347ac3dcc0faea4be30cd11bf8f3984d7afcb0709a32d4897e825cbbf714accd04e2be33eb12627e8e80f3309 SHA512 4d340d46831c089e2b9f9d1d44e0b1d2a0cd020cb50eed8589a5f745ec5c806b9ff65d0751b7439366135cc3bb801d725586e4f285ec27b24e90cac69383cd3a
 EBUILD rocm-comgr-6.3.2-r1.ebuild 2499 BLAKE2B e4a6e306f6c1a3a47f4392e030ba9e88f6c1bf5a3946c5781145a50df7caf0e98c58f12340dd6cbfbec44dc6ee68c018768b8c5be190660fbe6069dff27fa703 SHA512 34c569412644f7482d282ed9c10a62038584f0c7c97a07932be34808bfad2964ddad2fda10a91fa798007b8c4e9dad73ccc1761fa78e33857d7301277f40a39c
+EBUILD rocm-comgr-6.3.3.ebuild 2499 BLAKE2B e4a6e306f6c1a3a47f4392e030ba9e88f6c1bf5a3946c5781145a50df7caf0e98c58f12340dd6cbfbec44dc6ee68c018768b8c5be190660fbe6069dff27fa703 SHA512 34c569412644f7482d282ed9c10a62038584f0c7c97a07932be34808bfad2964ddad2fda10a91fa798007b8c4e9dad73ccc1761fa78e33857d7301277f40a39c
 MISC metadata.xml 638 BLAKE2B d2396daa1a9e505ff3fc3b7a2465f4ca5c933ac8609c08732513c30ebb715f244681075b8b415b75a0d0c330144cb6fab483e6b4231b1144c3bf3bc5091693f3 SHA512 da41a365f6d75e8feabed3a54ca117a8406cabec215137751280ab5985ab86e178a14183e804af220b49b83d4084489c1ec1dd1d543aaa585d910b6636b866c4
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.3.3.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.3.3.ebuild
new file mode 100644
index 000000000000..cea4ebe78e73
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-6.3.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+
+inherit cmake llvm-r1 prefix
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/comgr" )
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/comgr"
+SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/${components[0]}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
+	"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
+	"${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch"
+	"${FILESDIR}/${PN}-6.3.0-fix-comgr-default-flags.patch"
+	"${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch"
+	"${FILESDIR}/${PN}-6.3.0-llvm-19-compat.patch"
+	"${FILESDIR}/${PN}-6.3.0-bypass-device-libs-copy.patch"
+)
+
+RDEPEND="
+	dev-libs/rocm-device-libs:${SLOT}
+	llvm-core/clang-runtime:=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/lld:${LLVM_SLOT}=
+	')
+	dev-util/hipcc:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
+	sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die
+	eapply $(prefixify_ro "${FILESDIR}"/${PN}-6.3.2-rocm_path.patch)
+
+	cmake_src_prepare
+
+	# Replace @CLANG_RESOURCE_DIR@ in patches
+	local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)"
+	sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix)"
+		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	# Prevent CMake from finding systemwide hip, which breaks tests
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_hip=ON )
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35
+	)
+	cmake_src_test
+}