Skip to content

Commit

Permalink
Header-only devel package PROVIDES field fixes (ROCm#170)
Browse files Browse the repository at this point in the history
* Fix provides field

Previously the code for provides field was not evaluating the CPACK_DEBIAN_PACKAGE_PROVIDES variable, causing CPACK_DEBIAN_PACKAGE_PROVIDES to be included as a literal string provided by the devel package.

* Correct debian/rpm

* Fix misplaced comma

* Remove version from RPM provides field

---------

Co-authored-by: Eiden Yoshida <47196116+eidenyoshida@users.noreply.github.com>
(cherry picked from commit d27d809)
  • Loading branch information
lawruble13 committed Sep 6, 2024
1 parent e494a50 commit 5c11142
Showing 1 changed file with 23 additions and 8 deletions.
31 changes: 23 additions & 8 deletions share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,29 @@ macro(rocm_create_package)
)
endif()
if(PARSE_HEADER_ONLY OR NOT BUILD_SHARED_LIBS)
rocm_join_if_set(", "
CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
CPACK_DEBIAN_PACKAGE_PROVIDES
"${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
rocm_join_if_set(", "
CPACK_RPM_DEVEL_PACKAGE_PROVIDES
CPACK_DEBIAN_PACKAGE_PROVIDES
"${CPACK_PACKAGE_NAME} = ${CPACK_PACKAGE_VERSION}")
if(DEFINED CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES)
rocm_join_if_set(", "
CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
"${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})"
)
else()
rocm_join_if_set(", "
CPACK_DEBIAN_DEVEL_PACKAGE_PROVIDES
"${CPACK_DEBIAN_PACKAGE_PROVIDES}"
"${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
endif()

if(DEFINED CPACK_RPM_DEVEL_PACKAGE_PROVIDES)
rocm_join_if_set(", "
CPACK_RPM_DEVEL_PACKAGE_PROVIDES
"${CPACK_PACKAGE_NAME}"
)
else()
rocm_join_if_set(", "
CPACK_RPM_DEVEL_PACKAGE_PROVIDES
"${CPACK_RPM_PACKAGE_PROVIDES}"
"${CPACK_PACKAGE_NAME}")
endif()
else()
rocm_package_add_dependencies(COMPONENT devel DEPENDS "${CPACK_PACKAGE_NAME} >= ${CPACK_PACKAGE_VERSION}")
endif()
Expand Down

0 comments on commit 5c11142

Please sign in to comment.