From 7d021f8196da4c1dac24e97d81c7f0ceef32a52b Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Wed, 19 Jun 2024 01:24:30 -0700 Subject: [PATCH] SWDEV-469045 - Replace the rocm-llvm package dependency with rocm-llvm-static for static builds Change-Id: I6787fa374608edb4349baab19b833980e3cb5b29 [ROCm/clr commit: d240b039695b88393baf6115fa5e70ef55088743] --- projects/clr/hipamd/packaging/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/packaging/CMakeLists.txt b/projects/clr/hipamd/packaging/CMakeLists.txt index b8938c3ed7..f161d597d0 100644 --- a/projects/clr/hipamd/packaging/CMakeLists.txt +++ b/projects/clr/hipamd/packaging/CMakeLists.txt @@ -315,11 +315,13 @@ if(NOT BUILD_SHARED_LIBS) set(CPACK_RPM_STATIC_PACKAGE_REQUIRES "${CPACK_RPM_DEV_PACKAGE_REQUIRES}, ${HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES}") string(REGEX REPLACE ",? ?hsa-rocr-devel" "" CPACK_RPM_STATIC_PACKAGE_REQUIRES ${CPACK_RPM_STATIC_PACKAGE_REQUIRES}) - string(APPEND CPACK_RPM_STATIC_PACKAGE_REQUIRES ", hsa-rocr-static-devel, rocminfo-static-devel, comgr-static-devel") + string(REGEX REPLACE ",? ?rocm-llvm" "" CPACK_RPM_STATIC_PACKAGE_REQUIRES ${CPACK_RPM_STATIC_PACKAGE_REQUIRES}) + string(APPEND CPACK_RPM_STATIC_PACKAGE_REQUIRES ", hsa-rocr-static-devel, rocm-llvm-static, rocminfo-static-devel, comgr-static-devel") set(CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS "${CPACK_DEBIAN_DEV_PACKAGE_DEPENDS}, ${HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES}") string(REGEX REPLACE ",? ?hsa-rocr-dev" "" CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS ${CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS}) - string(APPEND CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS ", hsa-rocr-static-dev, rocminfo-static-dev, comgr-static-dev") + string(REGEX REPLACE ",? ?rocm-llvm" "" CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS ${CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS}) + string(APPEND CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS ", hsa-rocr-static-dev, rocm-llvm-static, rocminfo-static-dev, comgr-static-dev") endif() include(CPack) #static package generation