From b3fef92e618039dc93153a93176184a49606c74a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 Mar 2023 11:57:01 +0000 Subject: gentoo auto-resync : 07:03:2023 - 11:57:00 --- dev-libs/rocm-comgr/Manifest | 5 +- .../files/rocm-comgr-5.3.3-remove-h-option.patch | 43 +++++++++++++++ dev-libs/rocm-comgr/rocm-comgr-5.3.3-r1.ebuild | 61 --------------------- dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild | 62 ++++++++++++++++++++++ dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild | 61 +++++++++++++++++++++ dev-libs/rocm-comgr/rocm-comgr-5.4.3.ebuild | 60 --------------------- 6 files changed, 169 insertions(+), 123 deletions(-) create mode 100644 dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch delete mode 100644 dev-libs/rocm-comgr/rocm-comgr-5.3.3-r1.ebuild create mode 100644 dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild create mode 100644 dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild delete mode 100644 dev-libs/rocm-comgr/rocm-comgr-5.4.3.ebuild (limited to 'dev-libs/rocm-comgr') diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index a8e1b6e082b0..ac46d9301b97 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -12,10 +12,11 @@ AUX rocm-comgr-5.1.3-rocm-path.patch 422 BLAKE2B 23200a9ead9cefe1af9b553da7448d9 AUX rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch 632 BLAKE2B ce681da93373691d24c7e85698f72477a372f65403ee25ba085bd3e36c79cb284b88ec50b9c16e5fe14fd3ce9b88fcf1486120032dfe6f97e9a85e757374a38c SHA512 b88fcf8ca208a7ce30777694903af0a4ad9c2c8c1a93c361f6b6b6f6948073f06ecab5ca607250befe0d16a9ffeace9617f53b1288fcbf43396b5b658e448414 AUX rocm-comgr-5.3.3-fix-tests.patch 553 BLAKE2B f4227305c4c2c91d3fd1e9ad7fdc4477132002cd6cde8e7e9abd3f336978ff0ee9560f4f6216498c330c769cc3d65f52c2191d0298f3f82b0693bc4d3c4c0d4f SHA512 e2c6d3a9315469e4e53d0067bfddfe5d014a546b789ba7fd672204d4324c4fb19a4cdcdeb5bc8855e53cd5607e60e31677241993f4de1989aa68ce4ea5943706 AUX rocm-comgr-5.3.3-fno-stack-protector.patch 546 BLAKE2B 81da0bbc5405433600b60be432997134b4e7369814021e5c3a3bc1b88aec33c891de496f4d2af34c3c46742def8679092c0c6b1680babf58026d5e6e1ede7806 SHA512 f1a8da61c722f9c7ca0ceeab29f1032e5b488223a0c38a118608d75c2e4ab482625fffa75f8c85d1cb8dc9dd3b76ee8405e62405dc6e71ae6521c08acef23026 +AUX rocm-comgr-5.3.3-remove-h-option.patch 2060 BLAKE2B 593c3aebc4c9eeb387bd88ef31dc8e9a40434ef2497ee96f6dcad816a7e098c657987355e82c15566dbc71a168fcc5f584469903d8222d71c63bf68c0ae315e1 SHA512 2364449ed85963adbfa2a80a9a6e15e7a73ae642c17549da02fdc6878d93857d61f18d862cabfb7d56b27b052cb3de8abbc8c9d25a2d3f54288b15a6da293775 DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b DIST rocm-comgr-5.3.3.tar.gz 120414 BLAKE2B 29b9d466d74ef94165a2b9bea35eac4616f6b2fc529cdac3c830ee7dc08f219cb9e5d4f081658881c76633f12eaebb74d1a2ea30a76652231b8ee516f9988db1 SHA512 ba7b1ef214e3624168e438ed7fd94291a07508fe89d178c0b158bf22e0998d5a8e4d8f0a7f08f05ac108ef65f725db5764fd66353a85bc25000e572a4fdcb61f DIST rocm-comgr-5.4.3.tar.gz 120461 BLAKE2B c4eb79dd5a72a2b18e16841fc8cb9a3a33efb0c7b04a7585df9672d682bba6fa826ab8b37dba5febca3b8c5ee5aca30d8546e1fa69e77671e5c750e2a8c1f12f SHA512 1a25af99a0166d70ca6dc5df5a667068eaf583dccd74bbb18a2a5de3c1b769e0c1eb9a0c539e0cd88bc50bbbe53214a1d1b23fbdfd6fc5b6507c44da259815c4 EBUILD rocm-comgr-5.1.3-r3.ebuild 2051 BLAKE2B 98d8ad8164c8a401961a9abb1a973e1123a049c4a3949114f3493d36f02cd5f2048554828cf5838c00c47a128e21420ba7cf6c3de29086b918e56c5fe79410f7 SHA512 8341569140712543b778a771a381933a9cd14c0a5dcf3393e196d0121eb14a01614bf2080df2cd1f5a51b5bb3f5fb55dae9b7bddc4954900a64d5af0443e3a0f -EBUILD rocm-comgr-5.3.3-r1.ebuild 1894 BLAKE2B 5f4ec7e1d77b0cfc8177c3768cdcae19780769896298bd8e8f5fedca70255928a28f06f0f58dca64c78d4e9a0ab857b67056ff318aea228d28d29508c1355502 SHA512 b6919ff6fb65cc7099a5cad254d8c087ea0d293c0f045f6506ab4b66e21c914efe35db9d19710ae1b77b11e59451a441b55444bdd57987f5cab0e7fbf93f153d -EBUILD rocm-comgr-5.4.3.ebuild 1843 BLAKE2B d5bb1874c198abd4985852c1280e1a10f6166749a69027f7ab36026ccc36a5bca0cb4d64629e16e648969d7875b9c09ed883ae9ec902df7c2266e84cdf04b3ff SHA512 6c4441d9adec3c5b1c8d6f31420db65e4d2bd95767a8932d3320fc07f5eda5c8e05c04ce3830aba7fe44207749746230ff994ee89e6c8b7ceb28f64f0f2a715f +EBUILD rocm-comgr-5.3.3-r2.ebuild 1943 BLAKE2B e286731895a9cb985eef52ab23fea988d11fc4294fc65c91b9dc81ec5af8c5a747ae699a6af878436e8260c77e94402593fccae9dd8fdd65f05c3da27087b82f SHA512 fd5a47cb1eb354078c9aa4f5fc27d05629a7f40984e9f166a36a5d47faf8ccf3321d8a326145e192c25cc685ed041e9c756b7e57598902acc07c743ea0c7cc3c +EBUILD rocm-comgr-5.4.3-r1.ebuild 1892 BLAKE2B 3225c9fc2eb31f8810e1072ccf20681987ed6d8072f7bb0a1d661ab2eb327ad30afa0a6fd8f8299bd626f34cffd25e9f15d42a5e7fb6ac62f314755ce1ca3116 SHA512 265cd1523b8dc85a875a008cb8a2b6b3098cc07277199c3cccb749f4a30d22d8e71eefba1474aad18034b13002d734b46cec614f1fe56e67c4482dbeb8bc0079 MISC metadata.xml 526 BLAKE2B d2c4b5c4210cd4ae436bc205ec6c6d0e2690edc99250e508b64f3abbf0f7b4a61b27cb627d9453ff6432cd683fb7f51460b4e821ce7614880e68854121297db5 SHA512 5cf80a58a6791b404d33577fa1cd199791ad4348d0e18d2ba9d8e1665cfc5a19c7d37cfe265c77c060bc886f24ce28b592c6b7d541531faaf62e5440b732d2e7 diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch new file mode 100644 index 000000000000..1346ba4ef04d --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch @@ -0,0 +1,43 @@ +https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/commit/2d05f9e480cbc591a6b888dfd49d9f7ef1bef25f +Reference: https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/52 +Reference: https://bugs.gentoo.org/851702#c37 +This unblocks building blender with HIP cycles support +====================================================================== +From 2d05f9e480cbc591a6b888dfd49d9f7ef1bef25f Mon Sep 17 00:00:00 2001 +From: Jacob Lambert +Date: Thu, 12 Jan 2023 08:45:38 -0800 +Subject: [PATCH] Remove -h option from comgr-objdump + +The -h option (short for -headers) is a legal objdump option. +However registering this as an LLVM option by Comgr prevents other +LLVM tools or instances from registering a -h option in the same +process, which is an issue because -h is a common short form for +-help. + +A long term solution will be to libraryize llvm-obj dump, and +call it in Comgr via an API instead of re-implementation, which +will eliminate the need for Comgr to register any LLVM options for +objdump. + +Change-Id: Ieb1981aeb1826422647fd301c4827e2bfb370560 +--- + lib/comgr/src/comgr-objdump.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp +index 6d20a3c..ead69fe 100644 +--- a/src/comgr-objdump.cpp ++++ b/src/comgr-objdump.cpp +@@ -175,9 +175,9 @@ cl::opt SectionHeaders("section-headers", + static cl::alias SectionHeadersShort("headers", + cl::desc("Alias for --section-headers"), + cl::aliasopt(SectionHeaders)); +-static cl::alias SectionHeadersShorter("h", +- cl::desc("Alias for --section-headers"), +- cl::aliasopt(SectionHeaders)); ++// The following option has been removed to avoid conflicts with ++// other llvm tools/instances also attempting to register a -h option ++// static cl::alias SectionHeadersShorter("h", ...) + + cl::list + FilterSections("section", diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r1.ebuild deleted file mode 100644 index f97e82109722..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=15 - -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-clang-fix-include.patch" - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/${PN}-5.1.3-llvm-15-remove-zlib-gnu" - "${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.3.3-HIPIncludePath-not-needed.patch" - "${FILESDIR}/${PN}-5.3.3-fix-tests.patch" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.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/clang:${LLVM_MAX_SLOT}= - sys-devel/clang-runtime:= - sys-devel/lld:${LLVM_MAX_SLOT}=" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -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 ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-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-5.3.3-r2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild new file mode 100644 index 000000000000..1ed450afa574 --- /dev/null +++ b/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake llvm prefix + +LLVM_MAX_SLOT=15 + +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-clang-fix-include.patch" + "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" + "${FILESDIR}/${PN}-5.1.3-llvm-15-remove-zlib-gnu" + "${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.3.3-HIPIncludePath-not-needed.patch" + "${FILESDIR}/${PN}-5.3.3-fix-tests.patch" + "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" + "${FILESDIR}/${PN}-5.3.3-remove-h-option.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/clang:${LLVM_MAX_SLOT}= + sys-devel/clang-runtime:= + sys-devel/lld:${LLVM_MAX_SLOT}=" +DEPEND="${RDEPEND}" + +CMAKE_BUILD_TYPE=Release + +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 ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die + eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-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-5.4.3-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild new file mode 100644 index 000000000000..f04009a2596a --- /dev/null +++ b/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake llvm prefix + +LLVM_MAX_SLOT=15 + +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-clang-fix-include.patch" + "${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.3.3-HIPIncludePath-not-needed.patch" + "${FILESDIR}/${PN}-5.3.3-fix-tests.patch" + "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" + "${FILESDIR}/${PN}-5.3.3-remove-h-option.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/clang:${LLVM_MAX_SLOT}= + sys-devel/clang-runtime:= + sys-devel/lld:${LLVM_MAX_SLOT}=" +DEPEND="${RDEPEND}" + +CMAKE_BUILD_TYPE=Release + +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 ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die + eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-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-5.4.3.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.4.3.ebuild deleted file mode 100644 index 4f784ee9ee57..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.4.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=15 - -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-clang-fix-include.patch" - "${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.3.3-HIPIncludePath-not-needed.patch" - "${FILESDIR}/${PN}-5.3.3-fix-tests.patch" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.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/clang:${LLVM_MAX_SLOT}= - sys-devel/clang-runtime:= - sys-devel/lld:${LLVM_MAX_SLOT}=" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -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 ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-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 -} -- cgit v1.2.3