From afc4a0a83535169a55705bea00d71e4e88400bf5 Mon Sep 17 00:00:00 2001 From: "Sv. Lockal" Date: Wed, 22 May 2024 07:36:17 +0000 Subject: [PATCH] dev-libs/rocm-comgr: fix hip compiler on musl profile Signed-off-by: Sv. Lockal --- .../rocm-comgr-6.1.0-fix-comgr-default-flags.patch | 14 +++++++++++--- dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild | 10 +++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch index 9bad87a68c3d6..d885da08ddaef 100644 --- a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch +++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch @@ -1,6 +1,10 @@ Remove HIP/ROCM includes ("-isystem /usr/include"), as they break inclusion of . Add inclusion of Clang resource dir (e.g. /usr/lib/clang/17), as it is used in hip runtime like that. -Issue: https://github.com/ROCm/clr/issues/82 +Remove hardcoded target to fix HIP on musl. + +Issues: +* https://github.com/ROCm/clr/issues/82 +* https://github.com/ROCm/llvm-project/issues/92 --- a/src/comgr-compiler.cpp +++ b/src/comgr-compiler.cpp @@ -1028,9 +1028,8 @@ AMDGPUCompiler::addTargetIdentifierFlags(llvm::StringRef IdentStr, @@ -15,8 +19,12 @@ Issue: https://github.com/ROCm/clr/issues/82 Args.push_back("-x"); -@@ -1055,9 +1054,7 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { - Args.push_back("x86_64-unknown-linux-gnu"); +@@ -1051,13 +1050,9 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { + case AMD_COMGR_LANGUAGE_HIP: + Args.push_back("hip"); + Args.push_back("-std=c++11"); +- Args.push_back("-target"); +- Args.push_back("x86_64-unknown-linux-gnu"); Args.push_back("--cuda-device-only"); Args.push_back("-isystem"); - Args.push_back(ROCMIncludePath.c_str()); diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild index b52f76a962ea8..c5e49e4ec032c 100644 --- a/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild +++ b/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild @@ -20,6 +20,11 @@ else KEYWORDS="~amd64" fi +DESCRIPTION="Radeon Open Compute Code Object Manager" +HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + IUSE="test" RESTRICT="!test? ( test )" @@ -37,11 +42,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" ) -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - RDEPEND=">=dev-libs/rocm-device-libs-${PV} sys-devel/clang-runtime:= $(llvm_gen_dep '