diff --git a/.gitignore b/.gitignore index 2862953..8439c2d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libhsakmt-172d101.tar.gz /roc-2.0.0.tar.gz /rocm-3.5.0.tar.gz +/rocm-3.9.0.tar.gz diff --git a/0001-Fix-install-targets.patch b/0001-Fix-install-targets.patch index bccdc95..3c919d9 100644 --- a/0001-Fix-install-targets.patch +++ b/0001-Fix-install-targets.patch @@ -1,27 +1,59 @@ -From dfa6ab45c09c35c1250ba67b793991cd4eecc0bf Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Thu, 16 Jul 2020 05:05:40 +0000 +From f5e043b30085fb9095a96ea9039fc98b87b65ee1 Mon Sep 17 00:00:00 2001 +From: Philipp Knechtges +Date: Wed, 25 Nov 2020 20:23:56 +0100 Subject: [PATCH] Fix install targets --- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + CMakeLists.txt | 15 +++++++-------- + hsakmt-config.cmake.in | 1 + + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1b1b66d..84dbbf6 100644 +index 7bd07ad..b164bf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -165,7 +165,9 @@ add_custom_target ( package-dev DEPENDS build-dev +@@ -160,16 +160,14 @@ set ( CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "Default install + set ( CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Default packaging prefix." ) + set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Default packaging generators." ) - ## Add the install directives for the runtime library. - install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} ) --install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} ) -+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/hsakmt.h DESTINATION include/libhsakmt ) -+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/hsakmttypes.h DESTINATION include/libhsakmt ) -+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/linux/kfd_ioctl.h DESTINATION include/libhsakmt/linux ) ++set_target_properties(${HSAKMT_TARGET} PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/hsakmt.h;${CMAKE_CURRENT_SOURCE_DIR}/include/hsakmttypes.h;${CMAKE_CURRENT_SOURCE_DIR}/include/linux/kfd_ioctl.h") ++ + # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets + install ( TARGETS ${HSAKMT_TARGET} EXPORT ${HSAKMT_TARGET}Targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary ) +- +-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary ) +- +-# Install public headers +-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +- COMPONENT devel PATTERN "linux" EXCLUDE ) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libhsakmt ++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libhsakmt ) - ## Add the packaging directives for the runtime library. - set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} ) + # Record our usage data for clients find_package calls. + install ( EXPORT ${HSAKMT_TARGET}Targets +@@ -192,7 +190,8 @@ include(CMakePackageConfigHelpers) + configure_package_config_file(${HSAKMT_TARGET}-config.cmake.in + ${HSAKMT_TARGET}-config.cmake + INSTALL_DESTINATION +- ${CMAKE_INSTALL_LIBDIR}/cmake/${HSAKMT_TARGET} ) ++ ${CMAKE_INSTALL_LIBDIR}/cmake/${HSAKMT_TARGET} ++ PATH_VARS INCLUDE_INSTALL_DIR ) + + write_basic_package_version_file(${HSAKMT_TARGET}-config-version.cmake + VERSION ${BUILD_VERSION_STRING} +diff --git a/hsakmt-config.cmake.in b/hsakmt-config.cmake.in +index 9b162da..03c1001 100644 +--- a/hsakmt-config.cmake.in ++++ b/hsakmt-config.cmake.in +@@ -10,4 +10,5 @@ include( CMakeFindDependencyMacro ) + # find_dependencies as shown below. + #find_dependency(Bar, 2.0) + ++set_and_check(@HSAKMT_TARGET@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@/libhsakmt") + include( "${CMAKE_CURRENT_LIST_DIR}/@HSAKMT_TARGET@Targets.cmake" ) -- -2.26.2 +2.28.0 diff --git a/hsakmt.spec b/hsakmt.spec index c72c055..4f71225 100644 --- a/hsakmt.spec +++ b/hsakmt.spec @@ -1,8 +1,8 @@ %define __cmake_in_source_build 1 -%global rocm_version 3.5.0 +%global rocm_version 3.9.0 Name: hsakmt Version: 1.0.6 -Release: 14.rocm%{rocm_version}%{?dist} +Release: 15.rocm%{rocm_version}%{?dist} Summary: AMD's HSA thunk library License: MIT @@ -10,8 +10,6 @@ URL: https://github.com/RadeonOpenCompute/ROCm Source0: https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-%{rocm_version}.tar.gz Patch0: 0001-Fix-install-targets.patch -#Patch1: 0001-CMakeLists-Set-the-correct-default-version.patch -#Patch2: 0001-Use-CFLAGS-and-LDFLAGS-specified-in-environment-vari.patch ExclusiveArch: x86_64 aarch64 BuildRequires: gcc @@ -48,11 +46,14 @@ mkdir build cd build %cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -%make_build +%cmake_build %install cd build -%make_install +%cmake_install + +mkdir -p %{buildroot}%{_includedir}/libhsakmt/linux +mv %{buildroot}%{_includedir}/libhsakmt/kfd_ioctl.h %{buildroot}%{_includedir}/libhsakmt/linux/ %ldconfig_scriptlets @@ -67,8 +68,13 @@ cd build %{_includedir}/libhsakmt/hsakmt.h %{_includedir}/libhsakmt/hsakmttypes.h %{_includedir}/libhsakmt/linux/kfd_ioctl.h +%{_libdir}/cmake/hsakmt/ +%{_datadir}/pkgconfig/libhsakmt.pc %changelog +* Mon Nov 23 2020 Philipp Knechtges - 1.0.6-15.rocm3.9.0 +- Update to ROCm version 3.9.0 + * Wed Sep 23 2020 Jeff Law - 1.0.6-14.rocm3.5.0 - Use cmake_in_source_build to fix FTBFS due to recent cmake macro changes diff --git a/sources b/sources index 4b1f397..45db663 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rocm-3.5.0.tar.gz) = aeeb066924d0b20aadf1e2ea6f752d4de1e579fcf245b8866d2856a8d0ca12c907234d97e986512c7c6fa58460937aa5fb574485fbc7975baae4c2fcef519d6c +SHA512 (rocm-3.9.0.tar.gz) = eb0d3abaae1aa92f60eeb58ef07bf6dd0f954488e2e05bcf30cb75aa772430c49a3103b0498208c7f8f8fd35fb5d91f0f8c056064ce595263e1737e8f72ba462