Skip to content

Changes for SWDEV-530465 and Enabling support for Lintian #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: amd-staging
Choose a base branch
from
+36 −18
Draft

Changes for SWDEV-530465 and Enabling support for Lintian #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 34 additions & 16 deletions amd/comgr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ set (ver_minor ${CMAKE_MATCH_1})

message("Comgr Version: ${ver_major}.${ver_minor}.0")

project(amd_comgr VERSION "${ver_major}.${ver_minor}.0" LANGUAGES C CXX)
set(amd_comgr_NAME "${PROJECT_NAME}")
project(amd-comgr VERSION "${ver_major}.${ver_minor}.0" LANGUAGES C CXX)
set(amd_comgr_NAME "amd_comgr")

# Get git branch and commit hash to add to log for easier debugging.
execute_process(
Expand Down Expand Up @@ -260,16 +260,16 @@ include(DeviceLibs)
# Add major version to the name on windows, including Win64
if (WIN32)
set_target_properties(amd_comgr PROPERTIES
OUTPUT_NAME "amd_comgr_${amd_comgr_VERSION_MAJOR}")
OUTPUT_NAME "amd_comgr_${amd-comgr_VERSION_MAJOR}")
endif()

set_target_properties(amd_comgr PROPERTIES
CXX_STANDARD 17
CXX_STANDARD_REQUIRED Yes
CXX_EXTENSIONS No)
set_target_properties(amd_comgr PROPERTIES
SOVERSION "${amd_comgr_VERSION_MAJOR}"
VERSION "${amd_comgr_VERSION_MAJOR}.${amd_comgr_VERSION_MINOR}.${amd_comgr_VERSION_PATCH}")
SOVERSION "${amd-comgr_VERSION_MAJOR}"
VERSION "${amd-comgr_VERSION_MAJOR}.${amd-comgr_VERSION_MINOR}.${amd-comgr_VERSION_PATCH}")

if (NOT COMGR_BUILD_SHARED_LIBS)
set_target_properties(amd_comgr PROPERTIES POSITION_INDEPENDENT_CODE ON)
Expand Down Expand Up @@ -337,7 +337,7 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
"lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}"
@ONLY)
write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}"
VERSION "${amd_comgr_VERSION}"
VERSION "${amd-comgr_VERSION}"
COMPATIBILITY SameMajorVersion)

if(ENABLE_ASAN_PACKAGING)
Expand Down Expand Up @@ -512,19 +512,25 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(CPACK_COMPONENTS_ALL amd-comgr)
set(PKG_DESC_SUMMARY "Library to provide support functions for ROCm code objects.")
endif()
set(CPACK_PACKAGE_NAME comgr)
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PKG_DESC_SUMMARY})
set(CPACK_PACKAGE_DESCRIPTION "This package contains the AMD ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}.")
set(CPACK_PACKAGE_VERSION_MAJOR "${amd_comgr_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${amd_comgr_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${amd_comgr_VERSION_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${amd-comgr_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${amd-comgr_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${amd-comgr_VERSION_PATCH}")
set(CPACK_PACKAGE_CONTACT "ROCm Compiler Support <rocm.compiler.support@amd.com>")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")

# ASAN Specific variables
set(CPACK_DEBIAN_ASAN_PACKAGE_NAME comgr-asan)
set(CPACK_RPM_ASAN_PACKAGE_NAME comgr-asan)
set(CPACK_DEBIAN_ASAN_PACKAGE_NAME ${PROJECT_NAME}-asan)
set(CPACK_DEBIAN_ASAN_PACKAGE_PROVIDES comgr-asan)
set(CPACK_DEBIAN_ASAN_PACKAGE_CONFLICTS comgr-asan)
set(CPACK_DEBIAN_ASAN_PACKAGE_REPLACES comgr-asan)
set(CPACK_RPM_ASAN_PACKAGE_NAME ${PROJECT_NAME}-asan)
set(CPACK_RPM_ASAN_PACKAGE_PROVIDES comgr-asan)
set(CPACK_RPM_ASAN_PACKAGE_CONFLICTS comgr-asan)
set(CPACK_RPM_ASAN_PACKAGE_OBSOLETES comgr-asan)

# Make proper version for appending
set(ROCM_VERSION_FOR_PACKAGE "")
Expand All @@ -543,9 +549,15 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
# Debian package specific variables
set(CPACK_DEB_COMPONENT_INSTALL ON)
if(COMGR_BUILD_SHARED_LIBS)
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_NAME comgr)
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_NAME ${PROJECT_NAME})
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_PROVIDES comgr)
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_CONFLICTS comgr)
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_REPLACES comgr)
else()
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_NAME comgr-static-dev)
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_NAME ${PROJECT_NAME}-static-dev)
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_PROVIDES comgr-static-dev)
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_CONFLICTS comgr-static-dev)
set(CPACK_DEBIAN_AMD-COMGR_PACKAGE_REPLACES comgr-static-dev)
endif()
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm/llvm-project/tree/amd-staging/amd/comgr")
set(DEBIAN_DEPENDENCIES "libzstd1, zlib1g, libc6, libstdc++6, libgcc-s1 | libgcc1")
Expand All @@ -565,9 +577,15 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
# RPM package specific variables
set(CPACK_RPM_COMPONENT_INSTALL ON)
if(COMGR_BUILD_SHARED_LIBS)
set(CPACK_RPM_AMD-COMGR_PACKAGE_NAME comgr)
set(CPACK_RPM_AMD-COMGR_PACKAGE_NAME ${PROJECT_NAME})
set(CPACK_RPM_AMD-COMGR_PACKAGE_PROVIDES comgr)
set(CPACK_RPM_AMD-COMGR_PACKAGE_CONFLICTS comgr)
set(CPACK_RPM_AMD-COMGR_PACKAGE_REPLACES comgr)
else()
set(CPACK_RPM_AMD-COMGR_PACKAGE_NAME comgr-static-devel)
set(CPACK_RPM_AMD-COMGR_PACKAGE_NAME ${PROJECT_NAME}-static-devel)
set(CPACK_RPM_AMD-COMGR_PACKAGE_PROVIDES comgr-static-devel)
set(CPACK_RPM_AMD-COMGR_PACKAGE_CONFLICTS comgr-static-devel)
set(CPACK_RPM_AMD-COMGR_PACKAGE_REPLACES comgr-static-devel)
endif()

execute_process(COMMAND rpm --eval %{?dist}
Expand Down
4 changes: 2 additions & 2 deletions amd/comgr/include/amd_comgr.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
#endif
#endif

#define AMD_COMGR_INTERFACE_VERSION_MAJOR @amd_comgr_VERSION_MAJOR@
#define AMD_COMGR_INTERFACE_VERSION_MINOR @amd_comgr_VERSION_MINOR@
#define AMD_COMGR_INTERFACE_VERSION_MAJOR @amd-comgr_VERSION_MAJOR@
#define AMD_COMGR_INTERFACE_VERSION_MINOR @amd-comgr_VERSION_MINOR@

#ifdef __cplusplus
extern "C" {
Expand Down