Skip to content

Commit 5e95e34

Browse files
committed
SWDEV-485453 - remove hip-dev pkg dependency from hipcc
This avoid circular dependency between hipcc and hip-dev hip-dev should depend on hipcc and not the other way round Change-Id: I4833f991b15d5b9dffa3f6a69d05cae83ee5a90e
1 parent 55328b3 commit 5e95e34

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
@@ -68,7 +68,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
6868
set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
6969
set(CPACK_DEB_COMPONENT_INSTALL ON)
7070
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
71-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0), hip-dev, rocm-core")
71+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0), rocm-core")
7272
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm-Developer-Tools/HIPCC")
7373
if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
7474
set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
@@ -78,17 +78,17 @@ endif()
7878

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

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

8787

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

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

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

110110
# ROCM versioning.
111111
set(ROCM_VERSION_FOR_PACKAGE "")
@@ -213,11 +213,6 @@ if(NOT BUILD_SHARED_LIBS)
213213
# For static builds change the pakage name
214214
set(CPACK_DEBIAN_AMD_PACKAGE_NAME "hipcc-static-dev")
215215
set(CPACK_RPM_AMD_PACKAGE_NAME "hipcc-static-devel")
216-
# hip-dev/devel dependency not applicable fot static package
217-
string(REPLACE "hip-dev," "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
218-
string(REPLACE "hip-dev," "" CPACK_DEBIAN_AMD_PACKAGE_DEPENDS ${CPACK_DEBIAN_AMD_PACKAGE_DEPENDS})
219-
string(REPLACE "hip-devel," "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
220-
string(REPLACE "hip-devel," "" CPACK_RPM_AMD_PACKAGE_REQUIRES ${CPACK_RPM_AMD_PACKAGE_REQUIRES})
221216
endif()
222217

223218
include(CPack)

0 commit comments

Comments
 (0)