Skip to content

Commit c7fe45c

Browse files
authored
SWDEV-485453 - remove hip-dev pkg dependency from hipcc (llvm#1391)
Auto-submit by Jenkins
2 parents 2454976 + 59e8221 commit c7fe45c

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

amd/hipcc/CMakeLists.txt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
6464
set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
6565
set(CPACK_DEB_COMPONENT_INSTALL ON)
6666
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
67-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-dev, rocm-core")
67+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-core")
6868
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "perl (>= 5.0)")
6969
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm-Developer-Tools/HIPCC")
7070
if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
@@ -75,19 +75,19 @@ endif()
7575

7676
# AMD specific Debian packaging varibles.
7777
set(CPACK_DEBIAN_AMD_PACKAGE_NAME "hipcc")
78-
set(CPACK_DEBIAN_AMD_PACKAGE_DEPENDS "hip-dev, rocm-core, rocm-llvm")
78+
set(CPACK_DEBIAN_AMD_PACKAGE_DEPENDS "rocm-core, rocm-llvm")
7979
set(CPACK_DEBIAN_AMD_PACKAGE_RECOMMENDS "perl (>= 5.0)")
8080

8181
# NVIDIA specific Debian packaging variables.
8282
set(CPACK_DEBIAN_NVIDIA_PACKAGE_NAME "hipcc-nvidia")
83-
set(CPACK_DEBIAN_NVIDIA_PACKAGE_DEPENDS "hip-dev, rocm-core") # for NVIDIA we don't need to add rocm-llvm as a dependency
83+
set(CPACK_DEBIAN_NVIDIA_PACKAGE_DEPENDS "rocm-core") # for NVIDIA we don't need to add rocm-llvm as a dependency
8484
set(CPACK_DEBIAN_NVIDIA_PACKAGE_RECOMMENDS "perl (>= 5.0)")
8585

8686

8787
# RPM specific packaging variables.
8888
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
8989
set(CPACK_RPM_PACKAGE_LICENSE "MIT")
90-
set(CPACK_RPM_PACKAGE_REQUIRES "hip-devel, rocm-core")
90+
set(CPACK_RPM_PACKAGE_REQUIRES "rocm-core")
9191
set(CPACK_RPM_PACKAGE_SUGGESTS "perl >= 5.0")
9292
set(CPACK_RPM_PACKAGE_AUTOREQPROV 0)
9393
if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
@@ -101,12 +101,12 @@ endif()
101101

102102
# AMD specific RPM packaging varibables.
103103
set(CPACK_RPM_AMD_PACKAGE_NAME "hipcc")
104-
set(CPACK_RPM_AMD_PACKAGE_REQUIRES "hip-devel, rocm-core, rocm-llvm")
104+
set(CPACK_RPM_AMD_PACKAGE_REQUIRES "rocm-core, rocm-llvm")
105105
set(CPACK_RPM_AMD_PACKAGE_SUGGESTS "perl >= 5.0")
106106

107107
# NVIDIA specific RPM packaging variables.
108108
set(CPACK_RPM_NVIDIA_PACKAGE_NAME "hipcc-nvidia")
109-
set(CPACK_RPM_NVIDIA_PACKAGE_REQUIRES "hip-devel, rocm-core") # for NVIDIA we don't need to add rocm-llvm as a dependency
109+
set(CPACK_RPM_NVIDIA_PACKAGE_REQUIRES "rocm-core") # for NVIDIA we don't need to add rocm-llvm as a dependency
110110
set(CPACK_RPM_NVIDIA_PACKAGE_SUGGESTS "perl >= 5.0")
111111

112112
# ROCM versioning.
@@ -215,11 +215,6 @@ if(NOT BUILD_SHARED_LIBS)
215215
# For static builds change the pakage name
216216
set(CPACK_DEBIAN_AMD_PACKAGE_NAME "hipcc-static-dev")
217217
set(CPACK_RPM_AMD_PACKAGE_NAME "hipcc-static-devel")
218-
# hip-dev/devel dependency not applicable fot static package
219-
string(REPLACE "hip-dev," "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
220-
string(REPLACE "hip-dev," "" CPACK_DEBIAN_AMD_PACKAGE_DEPENDS ${CPACK_DEBIAN_AMD_PACKAGE_DEPENDS})
221-
string(REPLACE "hip-devel," "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
222-
string(REPLACE "hip-devel," "" CPACK_RPM_AMD_PACKAGE_REQUIRES ${CPACK_RPM_AMD_PACKAGE_REQUIRES})
223218
endif()
224219

225220
include(CPack)

0 commit comments

Comments
 (0)