commit: 93ff73188c29fe12088f6166df669847cde9b2b4 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Wed Jun 22 11:39:27 2022 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Wed Jun 22 13:00:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ff7318
dev-util/hip: fix build failure when git not installed Closes: https://bugs.gentoo.org/853718 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> dev-util/hip/files/hip-5.0.2-set-build-id.patch | 20 ++++++++++++++++++++ dev-util/hip/hip-5.0.2-r2.ebuild | 1 + 2 files changed, 21 insertions(+) diff --git a/dev-util/hip/files/hip-5.0.2-set-build-id.patch b/dev-util/hip/files/hip-5.0.2-set-build-id.patch new file mode 100644 index 000000000000..21dfadf18b61 --- /dev/null +++ b/dev-util/hip/files/hip-5.0.2-set-build-id.patch @@ -0,0 +1,20 @@ +If git is not found, HIP_VERSION_BUILD_ID will not be set, causing bug 853718 +=================================================================== +--- hipamd-rocm-5.0.2.orig/CMakeLists.txt ++++ hipamd-rocm-5.0.2/CMakeLists.txt +@@ -89,6 +89,7 @@ list(GET VERSION_LIST 2 HIP_VERSION_PATC + string(REPLACE "-" ";" VERSION_LIST ${HIP_VERSION_PATCH_GITHASH}) + list(GET VERSION_LIST 0 HIP_VERSION_PATCH) + set(HIP_VERSION_GITDATE 0) ++set(HIP_VERSION_BUILD_ID 0) + + find_package(Git) + +@@ -126,7 +127,6 @@ if(GIT_FOUND) + set(HIP_VERSION_GITHASH ${git_output}) + endif() + +- set(HIP_VERSION_BUILD_ID 0) + set(HIP_VERSION_BUILD_NAME "") + if(NOT DEFINED ENV{HIP_OFFICIAL_BUILD} AND NOT HIP_OFFICIAL_BUILD) + # FIXME: Disabling it for ROCm 5.0 diff --git a/dev-util/hip/hip-5.0.2-r2.ebuild b/dev-util/hip/hip-5.0.2-r2.ebuild index 037c442ec73b..223386227084 100644 --- a/dev-util/hip/hip-5.0.2-r2.ebuild +++ b/dev-util/hip/hip-5.0.2-r2.ebuild @@ -35,6 +35,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch" "${FILESDIR}/${PN}-5.0.1-hip_vector_types.patch" "${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch" + "${FILESDIR}/${PN}-5.0.2-set-build-id.patch" ) S="${WORKDIR}/hipamd-rocm-${PV}"
