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 AECEA158087 for ; Mon, 24 Jan 2022 14:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A3902BC02D; Mon, 24 Jan 2022 14:46:19 +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 E64AD2BC02D for ; Mon, 24 Jan 2022 14:46:18 +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 EA4CA342E32 for ; Mon, 24 Jan 2022 14:46:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58113D0 for ; Mon, 24 Jan 2022 14:46:16 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1643035568.2748258294bd38ddfe450715bd5ff94e1dd41ffb.heroxbd@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/files/rocm-comgr-4.3.0_strip-usr-include.patch dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild X-VCS-Directories: dev-libs/rocm-comgr/files/ dev-libs/rocm-comgr/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 2748258294bd38ddfe450715bd5ff94e1dd41ffb X-VCS-Branch: master Date: Mon, 24 Jan 2022 14:46:16 +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: 37285170-f28d-4f9e-bbec-4833c7fb29a5 X-Archives-Hash: ed13187e3ad3aa1286b3f5d0ff51268e commit: 2748258294bd38ddfe450715bd5ff94e1dd41ffb Author: Benda Xu gentoo org> AuthorDate: Mon Jan 24 14:41:45 2022 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Jan 24 14:46:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27482582 dev-libs/rocm-comgr: strip off ROCM_PATH/include. On Gentoo ROCM_PATH=/usr. We should not set the header path. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Benda Xu gentoo.org> .../files/rocm-comgr-4.3.0_strip-usr-include.patch | 16 +++++++++ dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild | 39 ++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch new file mode 100644 index 000000000000..9d722a57d2a6 --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch @@ -0,0 +1,16 @@ +On Gentoo, ROCM_PATH=/usr we do not need to set -I${ROCM_PATH}/include. +Actually it is harmful to the `include_next`s. + +Index: ROCm-CompilerSupport-rocm-4.3.0/lib/comgr/src/comgr-compiler.cpp +=================================================================== +--- comgr/src/comgr-compiler.cpp ++++ comgr/src/comgr-compiler.cpp +@@ -927,8 +927,6 @@ AMDGPUCompiler::addTargetIdentifierFlags + + amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { + HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str(); +- // HIP headers depend on hsa.h which is in ROCM_DIR/include. +- ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str(); + ClangIncludePath = + (Twine(env::getLLVMPath()) + "/lib/clang/" + CLANG_VERSION_STRING).str(); + ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/lib/clang/" + diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild new file mode 100644 index 000000000000..192ddca854e1 --- /dev/null +++ b/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +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}-3.1.0-dependencies.patch + "${FILESDIR}"/${PN}-4.3.0_strip-usr-include.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}" + +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" + ) + cmake_src_configure +}