summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYiyang Wu <xgreenlandforwyy@gmail.com>2022-06-22 19:39:27 +0800
committerBenda Xu <heroxbd@gentoo.org>2022-06-22 21:00:00 +0800
commit93ff73188c29fe12088f6166df669847cde9b2b4 (patch)
treec30b28de2d2bca8606c95c32a8dc794820878cc5 /dev-util/hip
parentdev-util/hip: Fix -isystem pollution after d5835abb (diff)
downloadgentoo-93ff73188c29fe12088f6166df669847cde9b2b4.tar.gz
gentoo-93ff73188c29fe12088f6166df669847cde9b2b4.tar.bz2
gentoo-93ff73188c29fe12088f6166df669847cde9b2b4.zip
dev-util/hip: fix build failure when git not installed
Closes: https://bugs.gentoo.org/853718 Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com> Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'dev-util/hip')
-rw-r--r--dev-util/hip/files/hip-5.0.2-set-build-id.patch20
-rw-r--r--dev-util/hip/hip-5.0.2-r2.ebuild1
2 files changed, 21 insertions, 0 deletions
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 00000000000..21dfadf18b6
--- /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 037c442ec73..22338622708 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}"