From 63d3edeb121622db86118d688d6426254501a1a9 Mon Sep 17 00:00:00 2001 From: TheK0tYaRa Date: Sun, 30 Mar 2025 08:34:42 +0300 Subject: [PATCH] removed pointless duplicates, prepared git comgr --- dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild | 66 -------------- dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild | 88 ------------------- dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild | 88 ------------------- ...6.3.2-r1.ebuild => rocm-comgr-9999.ebuild} | 6 +- metadata/md5-cache/dev-libs/rocm-comgr-6.3.3 | 2 +- 5 files changed, 6 insertions(+), 244 deletions(-) delete mode 100644 dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild delete mode 100644 dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild delete mode 100644 dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild rename dev-libs/rocm-comgr/{rocm-comgr-6.3.2-r1.ebuild => rocm-comgr-9999.ebuild} (94%) diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild deleted file mode 100644 index 51d6b5c..0000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=17 - -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 - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Specify-clang-exe-path-in-Driver-Creation.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-5.7.0-optional.patch" - "${FILESDIR}/${PN}-5.7.0-lld.patch" - "${FILESDIR}/${PN}-5.7.0-disassembly.patch" - "${FILESDIR}/${PN}-5.7.0-metadata.patch" - "${FILESDIR}/${PN}-5.7.0-symbolizer.patch" - "${FILESDIR}/${PN}-5.7.1-fix-tests.patch" - "${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.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} - (\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.7.1-fix-tests-rocm-path.patch) - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild deleted file mode 100644 index be39338..0000000 --- a/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 20 ) - -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/ROCm-CompilerSupport" -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}-5.7.1-correct-license-install-dir.patch" - "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch" - "${FILESDIR}/${PN}-6.1.0-llvm-18-compat.patch" - "${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch" - "${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch" - "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" -) - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - 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}-5.0-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) - ) - 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 -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild deleted file mode 100644 index be39338..0000000 --- a/dev-libs/rocm-comgr/rocm-comgr-6.1.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 20 ) - -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/ROCm-CompilerSupport" -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}-5.7.1-correct-license-install-dir.patch" - "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch" - "${FILESDIR}/${PN}-6.1.0-llvm-18-compat.patch" - "${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch" - "${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch" - "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" -) - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - 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}-5.0-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) - ) - 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 -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-9999.ebuild similarity index 94% rename from dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild rename to dev-libs/rocm-comgr/rocm-comgr-9999.ebuild index 8261dc4..57378aa 100644 --- a/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild +++ b/dev-libs/rocm-comgr/rocm-comgr-9999.ebuild @@ -12,7 +12,11 @@ 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" +if [[ $PV == 9999 ]]; then + # +else + SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz" +fi S="${WORKDIR}/${MY_P}/${components[0]}" LICENSE="MIT" diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-6.3.3 b/metadata/md5-cache/dev-libs/rocm-comgr-6.3.3 index 202a11e..534c936 100644 --- a/metadata/md5-cache/dev-libs/rocm-comgr-6.3.3 +++ b/metadata/md5-cache/dev-libs/rocm-comgr-6.3.3 @@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( llvm_slot_20 ) RESTRICT=!test? ( test ) SLOT=0/6.3 SRC_URI=https://github.com/ROCm/llvm-project/archive/rocm-6.3.3.tar.gz -> llvm-project-rocm-6.3.3.tar.gz -_eclasses_=toolchain-funcs 6afdb6107430c1832ca7e16aacbf8fa1 multilib b2a329026f2e404e9e371097dda47f96 flag-o-matic 357f1a896fbedcd06e5ce55419c49eb9 multiprocessing 1e32df7deee68372153dca65f4a7c21f ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 xdg-utils 42869b3c8d86a70ef3cf75165a395e09 cmake 10a50dfaf728b802fcfd37f8d0da9056 llvm-utils 7f49c40879f833f9d07e2d5a9643077b llvm-r1 0bd586d3786517cd63802a520b404dda prefix c3c4c93ebda319c0fa7ed6f942ba1010 +_eclasses_=toolchain-funcs 6afdb6107430c1832ca7e16aacbf8fa1 multilib b2a329026f2e404e9e371097dda47f96 flag-o-matic 16d3941ed2dc39f4819368ae51bc0b72 multiprocessing 1e32df7deee68372153dca65f4a7c21f ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 xdg-utils 42869b3c8d86a70ef3cf75165a395e09 cmake 10a50dfaf728b802fcfd37f8d0da9056 llvm-utils 846280a994c1843d9c21248c188bd147 llvm-r1 0bd586d3786517cd63802a520b404dda prefix c3c4c93ebda319c0fa7ed6f942ba1010 _md5_=b46285e3f32e818ec3e9438963b60a5a