Skip to content

Commit f378843

Browse files
g-h-crakesroy
authored andcommitted
SWDEV-510589 - Use libgcc1 package (on Debian 10 only)
Change-Id: Ibe945e366468a84fd717e0e425cfaf7dab5a99c4 (cherry picked from commit b073063)
1 parent 46040ca commit f378843

2 files changed

Lines changed: 25 additions & 1 deletion

File tree

hipamd/CMakeLists.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,23 @@ if ( PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "" )
181181
endif()
182182
message(STATUS "CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")
183183

184+
set (DEB10_DISTRO "FALSE")
185+
execute_process( COMMAND sh "-c" "cat /etc/os-release | grep \"^NAME=\""
186+
RESULT_VARIABLE PROC_RESULT_NAME
187+
OUTPUT_VARIABLE OS_NAME_RESULT
188+
OUTPUT_STRIP_TRAILING_WHITESPACE )
189+
execute_process( COMMAND sh "-c" "cat /etc/os-release | grep \"^VERSION_ID=\""
190+
RESULT_VARIABLE PROC_RESULT_VERSION
191+
OUTPUT_VARIABLE OS_VERSION_ID_RESULT
192+
OUTPUT_STRIP_TRAILING_WHITESPACE )
193+
194+
if ( PROC_RESULT_NAME EQUAL "0" AND NOT OS_NAME_RESULT STREQUAL "" AND
195+
PROC_RESULT_VERSION EQUAL "0" AND NOT OS_VERSION_ID_RESULT STREQUAL "")
196+
if ( "${OS_NAME_RESULT}" STREQUAL "NAME=\"Debian GNU/Linux\"" AND "${OS_VERSION_ID_RESULT}" STREQUAL "VERSION_ID=\"10\"")
197+
set ( DEB10_DISTRO "TRUE" )
198+
endif()
199+
endif()
200+
184201
add_to_config(_versionInfo HIP_PACKAGING_VERSION_PATCH)
185202
add_to_config(_versionInfo CPACK_DEBIAN_PACKAGE_RELEASE)
186203
add_to_config(_versionInfo CPACK_RPM_PACKAGE_RELEASE)

hipamd/packaging/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,19 @@ if(FILE_REORG_BACKWARD_COMPATIBILITY)
210210
set(CPACK_RPM_BINARY_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/binary/prerm")
211211
endif()
212212
string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION})
213+
213214
if(EL7_DISTRO)
214215
# centos: In centos using parenthesis is causing error. So set the specific dependencies
215216
set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "glibc, numactl-libs, libstdc++, libgcc")
216217
else()
217218
# RHEL/SLES
218-
set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "glibc, (numactl-libs or libnuma1), (libstdc++ or libstdc++6), (libgcc or libgcc_s1)")
219+
set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "glibc, (numactl-libs or libnuma1), (libstdc++ or libstdc++6)")
220+
if(DEB10_DISTRO)
221+
# On Debian Buster only: libgcc_s.so.1 is in the package libgcc1
222+
set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "${HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES}, libgcc1")
223+
else()
224+
set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "${HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES}, (libgcc or libgcc_s1)" )
225+
endif()
219226
endif()
220227
set(CPACK_RPM_BINARY_PACKAGE_REQUIRES "${HIP_RUNTIME_ROCM_PKG_DEPENDENCIES}, ${HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES}")
221228

0 commit comments

Comments
 (0)