From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A558D15800F for ; Wed, 1 Feb 2023 09:53:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00341E0E6E; Wed, 1 Feb 2023 09:53:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D92BBE0E6E for ; Wed, 1 Feb 2023 09:53:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAC3834027D for ; Wed, 1 Feb 2023 09:53:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7002E531 for ; Wed, 1 Feb 2023 09:53:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1675245157.b4a0add72872dedca2c46b09ef7b8fcfe92925fa.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-comgr/, dev-libs/rocm-comgr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocm-comgr/Manifest dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild X-VCS-Directories: dev-libs/rocm-comgr/files/ dev-libs/rocm-comgr/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b4a0add72872dedca2c46b09ef7b8fcfe92925fa X-VCS-Branch: master Date: Wed, 1 Feb 2023 09:53:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7174ef96-dc2a-43bc-8bcd-51ef4522b683 X-Archives-Hash: c908dd038002cf2207af4f0fab13ba36 commit: b4a0add72872dedca2c46b09ef7b8fcfe92925fa Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 24 22:15:55 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 1 09:52:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a0add7 dev-libs/rocm-comgr: drop 5.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/rocm-comgr/Manifest | 1 - .../files/rocm-comgr-5.0-rocm_path.patch | 14 ------ dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild | 50 ---------------------- 3 files changed, 65 deletions(-) diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index 037c51bb814e..6675acc0cfeb 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -1,3 +1,2 @@ -DIST rocm-comgr-5.0.2.tar.gz 117092 BLAKE2B 1ffcb74f9716a8f050d722f569cced66e8e9fa5a23a7156edd1b4dfd7dd7b09a175f3555bbf29ef452d7e4371f65ebe4c6fac30c583468a5563dd59fa92b53e4 SHA512 d2cf4517fc1da1adc367aaa6f53cc099547a931be30cc261d68c8174a5a9ffe3af937fbb298987abbdd7fd5d80364bef6ea9112dcaaf326a410fdd215e568f2f 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 diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch deleted file mode 100644 index 6e908847a54f..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: comgr/src/comgr-env.cpp -=================================================================== ---- comgr.orig/src/comgr-env.cpp -+++ comgr/src/comgr-env.cpp -@@ -247,6 +247,9 @@ InstallationDetector *getDetectorImpl() - if (EnvROCMPath) { - ROCmInstallPath = EnvROCMPath; - } -+ else { -+ ROCmInstallPath = "@GENTOO_PORTAGE_EPREFIX@/usr"; -+ } - - InstallationDetector *Detector; - if (ROCmInstallPath == "") { diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild deleted file mode 100644 index e7ed23e8d3a5..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake prefix - -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 - -PATCHES=( - "${FILESDIR}/${PN}-4.5.2-dependencies.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/llvm-roc-${PV}:=" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed '/sys::path::append(LLVMPath/s,"llvm","lib/llvm/roc",' -i src/comgr-env.cpp || die - sed '/Args.push_back(HIPIncludePath/,+1d' -i src/comgr-compiler.cpp || die - sed '/Args.push_back(ROCMIncludePath/,+1d' -i src/comgr-compiler.cpp || die # ROCM and HIPIncludePath is now /usr, which disturb the include order - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld" - -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm" - -DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - ) - cmake_src_configure -}