gentoo auto-resync : 07:08:2024 - 12:37:20

2 files changed, 85 insertions, 0 deletions

diff --git a/dev-util/hipcc/Manifest b/dev-util/hipcc/Manifest
index aadfbc006417..a4a27d713955 100644
--- a/dev-util/hipcc/Manifest
+++ b/dev-util/hipcc/Manifest
@@ -2,6 +2,8 @@ AUX hipcc-5.7.1-fno-stack-protector.patch 499 BLAKE2B d848b79ad2fd542bc6e6595ebc
 AUX hipcc-5.7.1-hipcc-hip-version.patch 2245 BLAKE2B 85e41db593706478e92966ee2ee33e1e8c8309251446f14192083a81e35f43be5dfa23337abc8371147b59c9399be79f9461cadf7ba0e025f1355d6c9836d68e SHA512 2cbfdeb9361b38a32ef52dec0c899c7cadc7220a5213fd6e9670c8a9ea6690e80e956d236e0de893bc4fe19117466659bdfdb2e16e720011b7480bc2e8bee458
 DIST hipcc-5.7.1.tar.gz 36589 BLAKE2B a8ae6bd9f0f985d78119223b67b5b35b8d1ee38edb7e43c1e77752d203fe2c8b669b3bcff0cec661054d8cb24f799e7784a49eb0664bdd1dc2bf024ce026c175 SHA512 2d232c8dd4a47de6e0cff9d37b4e63a26cb1809ef2ff3a119c15e992cae96ffc2f4d8c1ddffd8732dea3a3d589a93e177f424a6174f982908aa50904e265432a
 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
 EBUILD hipcc-5.7.1-r3.ebuild 1168 BLAKE2B 480af07e6feb93e684ff7de07efada9231d43296bfc498267c8d758a25d2690779b7d3bd9f872290f86a8621fa1e519d37d0712200ac0a2cb57c915942b2b3e0 SHA512 c3c3abb00fee6fcc593df78dad13b5ec8a144ed92439942512c67d9fb369dec7f8fa055075a0121a3b08823e236560d256741b1243fb14a3e643cda929f90650
 EBUILD hipcc-6.1.1.ebuild 2024 BLAKE2B 9cad5c85c2795a692878aa46b3b578e518e4ed8f2443d55d62408c16e0b3561417d34939dd52f26980f8fabf04b7d70ec53263fe47710bcff3b51eb8163609b5 SHA512 b09ef0e288403be4beaecd59d41a3c44e17c3543b3ff3f9fe59e4a7de44d54fca98d82fb5c12c834fa2246e301ac4d137e7bb54558a5a4b79a8578c82f4cd12b
+EBUILD hipcc-6.1.2.ebuild 2024 BLAKE2B 9cad5c85c2795a692878aa46b3b578e518e4ed8f2443d55d62408c16e0b3561417d34939dd52f26980f8fabf04b7d70ec53263fe47710bcff3b51eb8163609b5 SHA512 b09ef0e288403be4beaecd59d41a3c44e17c3543b3ff3f9fe59e4a7de44d54fca98d82fb5c12c834fa2246e301ac4d137e7bb54558a5a4b79a8578c82f4cd12b
 MISC metadata.xml 942 BLAKE2B 56fe9d0c0615796d69d11ced9aa54834f9e3cb649786cc117bb2628086be15e1bc2dfb8e96fc93a043603ab34abec04a8bb1592b101444ea077ba0d73e55c374 SHA512 84bac9774f2d0dfec093c0269fe76662dc12a44fa3d4861152c6a076165d44af399cdcb134bea93d094b9b9d0094bec6ba72f6f81ad29b7467ce5262348ba263
diff --git a/dev-util/hipcc/hipcc-6.1.2.ebuild b/dev-util/hipcc/hipcc-6.1.2.ebuild
new file mode 100644
index 000000000000..87a19b598953
--- /dev/null
+++ b/dev-util/hipcc/hipcc-6.1.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+inherit cmake perl-functions llvm-r1
+
+DESCRIPTION="Radeon Open Compute hipcc"
+HOMEPAGE="https://github.com/ROCm/hipcc"
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/hipcc" )
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
+	inherit git-r3
+	S="${WORKDIR}/${P}/${components[0]}"
+else
+	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/${components[0]}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	$(llvm_gen_dep '
+		sys-libs/compiler-rt:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+		sys-devel/clang:${LLVM_SLOT}=
+	')
+"
+RDEPEND="${DEPEND}
+	!<dev-util/hip-5.7"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch"
+)
+
+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() {
+	cmake_src_prepare
+
+	sed -e "s:\$ROCM_PATH/llvm/bin:$(get_llvm_prefix)/bin:" \
+		-e "s:/opt/rocm:/usr:" \
+		-i bin/hipvars.pm || die
+
+	sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
+		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
+		-i bin/hipcc.pl || die
+
+	# With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
+	# https://github.com/llvm/llvm-project/issues/86332
+	if [ "$LLVM_SLOT" != "17" ]; then
+		sed -e "s/-mllvm -amdgpu-early-inline-all=true //g" -i bin/hipcc.pl || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	# rm unwanted copy
+	rm -rf "${ED}/usr/hip" || die
+	# Handle hipvars.pm
+	rm "${ED}/usr/bin/hipvars.pm" || die
+	perl_domodule "${S}"/bin/hipvars.pm
+}