From 6939c8b154a1312c2b6c3ef71ebbe39c2d76b208 Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Sun, 19 Nov 2023 06:24:59 +0000 Subject: dev-util/hip: Force rebuild through revbump Changes in last few commits are otherwise invisible Signed-off-by: Patrick Lauer --- dev-util/hip/hip-5.7.1-r1.ebuild | 89 ++++++++++++++++++++++++++++++++++++++++ dev-util/hip/hip-5.7.1.ebuild | 89 ---------------------------------------- 2 files changed, 89 insertions(+), 89 deletions(-) create mode 100644 dev-util/hip/hip-5.7.1-r1.ebuild delete mode 100644 dev-util/hip/hip-5.7.1.ebuild (limited to 'dev-util') diff --git a/dev-util/hip/hip-5.7.1-r1.ebuild b/dev-util/hip/hip-5.7.1-r1.ebuild new file mode 100644 index 000000000000..c9094afe5ba6 --- /dev/null +++ b/dev-util/hip/hip-5.7.1-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" + +inherit cmake docs llvm + +LLVM_MAX_SLOT=17 + +DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" +SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz + https://github.com/ROCm-Developer-Tools/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +IUSE="debug" + +DEPEND=" + dev-util/hipcc + >=dev-util/rocminfo-5 + sys-devel/clang:${LLVM_MAX_SLOT} + dev-libs/rocm-comgr:${SLOT} + x11-base/xorg-proto + virtual/opengl +" +RDEPEND="${DEPEND} + dev-perl/URI-Encode + sys-devel/clang-runtime:= + >=dev-libs/roct-thunk-interface-5" + +PATCHES=( + "${FILESDIR}/${PN}-5.7.0-install.patch" + "${FILESDIR}/${PN}-5.7.1-fix-unaligned-access.patch" + "${FILESDIR}/${PN}-5.7.1-exec-stack.patch" + "${FILESDIR}/${PN}-5.7.1-disable-stack-protector.patch" + "${FILESDIR}/${PN}-5.7.1-no_asan_doc.patch" +) + +S="${WORKDIR}/clr-rocm-${PV}/" + +src_configure() { + use debug && CMAKE_BUILD_TYPE="Debug" + + # TODO: Currently a GENTOO configuration is build, + # this is also used in the cmake configuration files + # which will be installed to find HIP; + # Other ROCm packages expect a "RELEASE" configuration, + # see "hipBLAS" + local mycmakeargs=( + -DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" + -DCMAKE_BUILD_TYPE=${buildtype} + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_SKIP_RPATH=ON + -DBUILD_HIPIFY_CLANG=OFF + -DHIP_PLATFORM=amd + -DHIP_COMMON_DIR="${WORKDIR}/HIP-rocm-${PV}" + -DROCM_PATH="${EPREFIX}/usr" + -DUSE_PROF_API=0 + -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DCLR_BUILD_HIP=ON + -DHIPCC_BIN_DIR="${EPREFIX}/usr/bin" + -DOpenGL_GL_PREFERENCE="GLVND" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile +} + +src_install() { + cmake_src_install + + rm "${ED}/usr/include/hip/hcc_detail" || die + + # files already installed by hipcc, which is a build dep + rm "${ED}/usr/bin/hipconfig.pl" || die + rm "${ED}/usr/bin/hipcc.pl" || die + rm "${ED}/usr/bin/hipcc" || die + rm "${ED}/usr/bin/hipconfig" || die + rm "${ED}/usr/bin/hipvars.pm" || die +} diff --git a/dev-util/hip/hip-5.7.1.ebuild b/dev-util/hip/hip-5.7.1.ebuild deleted file mode 100644 index c9094afe5ba6..000000000000 --- a/dev-util/hip/hip-5.7.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_BUILDER="doxygen" -DOCS_DEPEND="media-gfx/graphviz" - -inherit cmake docs llvm - -LLVM_MAX_SLOT=17 - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" -SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug" - -DEPEND=" - dev-util/hipcc - >=dev-util/rocminfo-5 - sys-devel/clang:${LLVM_MAX_SLOT} - dev-libs/rocm-comgr:${SLOT} - x11-base/xorg-proto - virtual/opengl -" -RDEPEND="${DEPEND} - dev-perl/URI-Encode - sys-devel/clang-runtime:= - >=dev-libs/roct-thunk-interface-5" - -PATCHES=( - "${FILESDIR}/${PN}-5.7.0-install.patch" - "${FILESDIR}/${PN}-5.7.1-fix-unaligned-access.patch" - "${FILESDIR}/${PN}-5.7.1-exec-stack.patch" - "${FILESDIR}/${PN}-5.7.1-disable-stack-protector.patch" - "${FILESDIR}/${PN}-5.7.1-no_asan_doc.patch" -) - -S="${WORKDIR}/clr-rocm-${PV}/" - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=amd - -DHIP_COMMON_DIR="${WORKDIR}/HIP-rocm-${PV}" - -DROCM_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=0 - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DCLR_BUILD_HIP=ON - -DHIPCC_BIN_DIR="${EPREFIX}/usr/bin" - -DOpenGL_GL_PREFERENCE="GLVND" - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_install() { - cmake_src_install - - rm "${ED}/usr/include/hip/hcc_detail" || die - - # files already installed by hipcc, which is a build dep - rm "${ED}/usr/bin/hipconfig.pl" || die - rm "${ED}/usr/bin/hipcc.pl" || die - rm "${ED}/usr/bin/hipcc" || die - rm "${ED}/usr/bin/hipconfig" || die - rm "${ED}/usr/bin/hipvars.pm" || die -} -- cgit v1.2.3-65-gdbad