From c3ea8402eb37058a1bd0f3b2c3d68f1700919afc Mon Sep 17 00:00:00 2001 From: "Sv. Lockal" Date: Sat, 16 Mar 2024 14:00:22 +0000 Subject: [PATCH] dev-build/rocm-cmake: add 6.1.1 Changes comparing to 5.7.1: * rename RadeonOpenCompute -> ROCm in url * patch annoying warnings * add myself to maintainers * fix installation of license file Signed-off-by: Sv. Lockal Signed-off-by: Sam James --- dev-build/rocm-cmake/Manifest | 1 + .../files/rocm-cmake-6.1.1-license.patch | 12 +++++++ ...m-cmake-6.1.1-no-rocmchecks-warnings.patch | 25 +++++++++++++ dev-build/rocm-cmake/metadata.xml | 6 +++- dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild | 35 +++++++++++++++++++ 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch create mode 100644 dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch create mode 100644 dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild diff --git a/dev-build/rocm-cmake/Manifest b/dev-build/rocm-cmake/Manifest index ab5d28a36b320..4071eb7b05305 100644 --- a/dev-build/rocm-cmake/Manifest +++ b/dev-build/rocm-cmake/Manifest @@ -1 +1,2 @@ DIST rocm-cmake-5.7.1.tar.gz 50940 BLAKE2B f3a36cedfc15af69819b576bf8f8bdfe7b49e5dd1d4db57f707295f14a8d64904745f454fc211b28adfde369c82cb42a061c05b6675679e11a3946f6ebfea6d5 SHA512 1265ed8e23a04f9cff57b43f815e8fbbb1a3f200bc040e01ceaa92c322088c9ef04da795b09d732c6466dc9a3fefc505b8b474d3f18f55cff491758aa53a6e6b +DIST rocm-cmake-6.1.1.tar.gz 86888 BLAKE2B 91064e82199ac317c273005b9b6c07e33ab5199b456467e84ac0937036d26d1d5c1286e1e38932b2da11700fb2a7a90795e34d4a7c03ed3bf58959402060091e SHA512 af6d4e124a3ec4d1e810867db69d738ebe7cfea672065bb5279b72a4d4efce8c14305e76173f760044977082c6aa069453d8eef488368a88ac57eb9df20f8b0c diff --git a/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch new file mode 100644 index 0000000000000..f8770b345f859 --- /dev/null +++ b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch @@ -0,0 +1,12 @@ +This is not needed. Gentoo will collect license files into +the documentation directory in ebuild. +--- a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake ++++ b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake +@@ -409,7 +409,6 @@ macro(rocm_create_package) + if(PARSE_PTH) + rocm_parse_python_syspath(${LIB_DIR} ${PARSE_NAME}) + endif() +- rocm_setup_license(${PARSE_HEADER_ONLY}) + if(PARSE_COMPONENTS) + rocm_set_comp_cpackvar(PARSE_HEADER_ONLY "${PARSE_COMPONENTS}") + endif() diff --git a/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch new file mode 100644 index 0000000000000..73030e7b9b203 --- /dev/null +++ b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch @@ -0,0 +1,25 @@ +Gentoo uses cmake -C <...>/gentoo_common_config.cmake approach to set toolchain variables. +There is nothing wrong there, so there is no need to print huge ROCMChecks warnings. +--- a/share/rocmcmakebuildtools/cmake/ROCMChecks.cmake ++++ b/share/rocmcmakebuildtools/cmake/ROCMChecks.cmake +@@ -34,20 +34,6 @@ function(rocm_check_toolchain_var var access value list_file) + elseif("${base}" MATCHES ".*/CMakeFiles/${CMAKE_VERSION}$") + set(cmake_module On) + endif() +- if(NOT cmake_module) +- message( " +-******************************************************************************* +-*------------------------------- ${message_title} --------------------------* +- Options and properties should be set on a cmake target where possible. The +- variable '${var}' may be set by the cmake toolchain, either by +- calling 'cmake -D${var}=\"${value}\"' +- or set in a toolchain file and added with +- 'cmake -DCMAKE_TOOLCHAIN_FILE='. ROCMChecks now calling:") +- message(${message_type} "'${var}' is set at ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt: shown below:") +- message( "*-----------------------------------------------------------------------------* +-******************************************************************************* +-") +- endif() + endif() + endfunction() + if(UNIX AND (ROCM_WARN_TOOLCHAIN_VAR OR ROCM_ERROR_TOOLCHAIN_VAR)) diff --git a/dev-build/rocm-cmake/metadata.xml b/dev-build/rocm-cmake/metadata.xml index e13f2f7b57289..9b05010ce8601 100644 --- a/dev-build/rocm-cmake/metadata.xml +++ b/dev-build/rocm-cmake/metadata.xml @@ -9,7 +9,11 @@ candrews@gentoo.org Craig Andrews + + lockalsash@gmail.com + Sv. Lockal + - RadeonOpenCompute/rocm-cmake + ROCm/rocm-cmake diff --git a/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild new file mode 100644 index 0000000000000..1263ddfd3800d --- /dev/null +++ b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 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/ROCm/rocm-cmake.git" + inherit git-r3 +else + SRC_URI="https://github.com/ROCm/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/rocm-cmake-rocm-${PV}" +fi + +DESCRIPTION="Radeon Open Compute CMake Modules" +HOMEPAGE="https://github.com/ROCm/rocm-cmake" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +RESTRICT="test" + +DOCS=( CHANGELOG.md LICENSE README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-license.patch + "${FILESDIR}"/${PN}-6.1.1-no-rocmchecks-warnings.patch +) + +src_prepare() { + sed -e "/CMAKE_INSTALL_LIBDIR/s:lib:$(get_libdir):" \ + -i "share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake" \ + -i "share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake" || die + cmake_src_prepare +}