From 2d2992ea650e7670610e721b14842a3b0db10eef Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Thu, 15 Dec 2022 23:03:31 -0800 Subject: [PATCH] Corrected libelf package name in depends list libelf1 package contains libelf.so.1. Updated the package name Improvement: Removed the initialization of cmake_install_libdir in source code Build scripts is initializing the variable to "lib" and passed as build argument Change-Id: I16a8cdc4c231487410c1114b818e9d01df4854de [ROCm/ROCR-Runtime commit: 5c90c762f92bbbfad897953d65f31c21ff932f6f] --- projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt index 0181c97cd7..1135874593 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt @@ -59,8 +59,6 @@ project( ${CORE_RUNTIME_TARGET} ) list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" ) include ( utils ) include ( hsa_common ) -# Set default libdir to be "lib" for ROCm, distros will override this anyway: -set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory") include ( GNUInstallDirs ) ## Expose static library option @@ -411,7 +409,7 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/Binary/prerm.in DEBIAN/Binar set ( CPACK_DEBIAN_BINARY_PACKAGE_CONTROL_EXTRA "DEBIAN/Binary/postinst;DEBIAN/Binary/prerm" ) # package dependencies -set( CPACK_DEBIAN_BINARY_PACKAGE_DEPENDS "libdrm-amdgpu-amdgpu1 | libdrm-amdgpu1, libnuma1, libelf-dev") +set( CPACK_DEBIAN_BINARY_PACKAGE_DEPENDS "libdrm-amdgpu-amdgpu1 | libdrm-amdgpu1, libnuma1, libelf1") set( CPACK_DEBIAN_BINARY_PACKAGE_RECOMMENDS "libdrm-amdgpu-amdgpu1") set ( CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "hsa-rocr, hsakmt-roct-dev" ) if ( ROCM_DEP_ROCMCORE )