commit: 4567b9063f536c99bc56d1c768e3896eacbed354 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Oct 15 21:07:27 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Oct 16 18:11:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4567b906
dev-util/hipcc: drop 5.7.1-r3, 6.1.1, 6.1.2, 6.3.2, 6.4.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/hipcc/Manifest | 5 -- .../files/hipcc-5.7.1-fno-stack-protector.patch | 13 ---- dev-util/hipcc/hipcc-5.7.1-r3.ebuild | 50 ------------- dev-util/hipcc/hipcc-6.1.1.ebuild | 83 --------------------- dev-util/hipcc/hipcc-6.1.2.ebuild | 83 --------------------- dev-util/hipcc/hipcc-6.3.2.ebuild | 85 ---------------------- dev-util/hipcc/hipcc-6.4.1.ebuild | 72 ------------------ 7 files changed, 391 deletions(-) diff --git a/dev-util/hipcc/Manifest b/dev-util/hipcc/Manifest index 09d04397ac21..25ce599d73ad 100644 --- a/dev-util/hipcc/Manifest +++ b/dev-util/hipcc/Manifest @@ -1,7 +1,2 @@ -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 -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 llvm-project-rocm-6.4.1.tar.gz 218905831 BLAKE2B 188ec436e5ab6e50fee66ebc3a30c5e5703ca8770f309cca580c919567090bbdb23a5de51d36dabf9cb54f1142ab00d9756bec379670029c57d0f7a49fab2f13 SHA512 e0fd29953cfe7ae4b3f60aa25c1ec0f6071715afc8e275d62901dbd575b96afc673d61996300d3f7672005274fe84c7f934070614ac3deafcfa103d9514b3e41 DIST llvm-project-rocm-6.4.3.tar.gz 218920681 BLAKE2B 85c29c1f66f9d23fa7fb6d98baf60cb08a8507a7b3a4c0a5054d9d4d3bc1fb7de56ddae583e37a36c7a3f17f9e57bd49777deca7560ca8b4882c1eea1db5b421 SHA512 b6b4149c6426793f4497dfd1200079b0caef4d5a6f49c1f3a301d70f5f7b322b850085ff2f89d55df1dfab6d6a97948fe4084d4ec14654ee97cdab26e71a45c0 diff --git a/dev-util/hipcc/files/hipcc-5.7.1-fno-stack-protector.patch b/dev-util/hipcc/files/hipcc-5.7.1-fno-stack-protector.patch deleted file mode 100644 index c46420265005..000000000000 --- a/dev-util/hipcc/files/hipcc-5.7.1-fno-stack-protector.patch +++ /dev/null @@ -1,13 +0,0 @@ -Related bug: https://bugs.gentoo.org/890377 ---- a/bin/hipcc.pl -+++ b/bin/hipcc.pl -@@ -552,6 +552,9 @@ if ($buildDeps and $HIP_PLATFORM eq 'amd') { - # pass-through CPP mode. - - if ($HIP_PLATFORM eq "amd") { -+ # Append -fno-stack-protector due to stack protection for HIP is not supported -+ $HIPCXXFLAGS .= " -fno-stack-protector"; -+ $HIPCFLAGS .= " -fno-stack-protector"; - # Set default optimization level to -O3 for hip-clang. - if ($optArg eq "") { - $HIPCXXFLAGS .= " -O3"; diff --git a/dev-util/hipcc/hipcc-5.7.1-r3.ebuild b/dev-util/hipcc/hipcc-5.7.1-r3.ebuild deleted file mode 100644 index 5e968993a829..000000000000 --- a/dev-util/hipcc/hipcc-5.7.1-r3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm - -LLVM_MAX_SLOT=17 - -DESCRIPTION="Radeon Open Compute hipcc" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipcc"; - -KEYWORDS="~amd64" -SRC_URI="https://github.com/ROCm-Developer-Tools/hipcc/archive/refs/tags/rocm-${PV}.tar.gz -> hipcc-${PV}.tar.gz" - -LICENSE="Apache-2.0 MIT" -SLOT="0/$(ver_cut 1-2)" -IUSE="debug test" -RESTRICT="!test? ( test )" - -S=${WORKDIR}/HIPCC-rocm-${PV} - -DEPEND="<llvm-core/llvm-18:= - <llvm-core/clang-18:= - " -RDEPEND="${DEPEND} - !<dev-util/hip-5.7" - -PATCHES=( - "${FILESDIR}/${PN}-5.7.1-fno-stack-protector.patch" - "${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch" -) - -src_prepare() { - cmake_src_prepare - - sed -e "s:\$ROCM_PATH/llvm/bin:$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin:" \ - -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 -} - -src_install() { - cmake_src_install - # rm unwanted copy - rm -rf "${ED}/usr/hip" || die -} diff --git a/dev-util/hipcc/hipcc-6.1.1.ebuild b/dev-util/hipcc/hipcc-6.1.1.ebuild deleted file mode 100644 index ce671d75d5a5..000000000000 --- a/dev-util/hipcc/hipcc-6.1.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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 ' - llvm-runtimes/compiler-rt:${LLVM_SLOT}= - llvm-core/llvm:${LLVM_SLOT}= - llvm-core/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 -} diff --git a/dev-util/hipcc/hipcc-6.1.2.ebuild b/dev-util/hipcc/hipcc-6.1.2.ebuild deleted file mode 100644 index ce671d75d5a5..000000000000 --- a/dev-util/hipcc/hipcc-6.1.2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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 ' - llvm-runtimes/compiler-rt:${LLVM_SLOT}= - llvm-core/llvm:${LLVM_SLOT}= - llvm-core/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 -} diff --git a/dev-util/hipcc/hipcc-6.3.2.ebuild b/dev-util/hipcc/hipcc-6.3.2.ebuild deleted file mode 100644 index ef7b18819f1c..000000000000 --- a/dev-util/hipcc/hipcc-6.3.2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 19 ) -inherit cmake perl-functions llvm-r1 - -DESCRIPTION="Radeon Open Compute hipcc" -HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/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 ' - llvm-runtimes/compiler-rt:${LLVM_SLOT}= - llvm-core/llvm:${LLVM_SLOT}= - llvm-core/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:lib/llvm/bin:lib/llvm/${LLVM_SLOT}/bin:" \ - -e "s:/opt/rocm:/usr:g" \ - -i bin/hipvars.pm \ - -i src/hipBin_base.h \ - -i src/hipBin_amd.h || die - - sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ - -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ - -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 - sed -e "s/-mllvm -amdgpu-early-inline-all=true //g" \ - -i bin/hipcc.pl \ - -i src/hipBin_amd.h || die -} - -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 -} diff --git a/dev-util/hipcc/hipcc-6.4.1.ebuild b/dev-util/hipcc/hipcc-6.4.1.ebuild deleted file mode 100644 index 4a6c644e5d72..000000000000 --- a/dev-util/hipcc/hipcc-6.4.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 20 ) -inherit cmake perl-functions llvm-r1 - -DESCRIPTION="Radeon Open Compute hipcc" -HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/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 ' - llvm-runtimes/compiler-rt:${LLVM_SLOT}= - llvm-core/llvm:${LLVM_SLOT}= - llvm-core/clang:${LLVM_SLOT}= - ') -" -RDEPEND="${DEPEND}" - -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:lib/llvm/bin:lib/llvm/${LLVM_SLOT}/bin:" \ - -e "s:/opt/rocm:/usr:g" \ - -i bin/hipvars.pm \ - -i src/hipBin_base.h \ - -i src/hipBin_amd.h || die - - sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:g" \ - -i src/hipBin_amd.h || die -} - -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 -}
