mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-20 17:20:32 +02:00
a6306eb0bc
* gnu/packages/llvm.scm (%rocm-llvm-version): New variable. (make-llvm-rocm): New procedure. (llvm-rocm): New variable. (make-clang-runtime-rocm): New procedure. (clang-runtime-rocm): New variable. (make-clang-rocm): New procedure. (clang-rocm): New variable. (rocm-device-libs): New variable. (rocm-comgr): New variable. (rocm-hipcc): New variable. (make-lld-rocm): New procedure. (lld-rocm): New variable. * gnu/packages/rocm.scm: Add perl to imports. (%rocm-version): Update to 7.1.0. (%rocm-systems-url, %rocm-systems-origin): New variables. (rocr-runtime): Use %rocm-systems-origin and update build. (rocm-opencl-runtime): Use %rocm-systems-origin and update build. (rocm-hip-runtime): New variable. (rocminfo): Use %rocm-systems-origin and update build. (%default-amdgpu-targets, %default-amdgpu-targets-property): New variables. (%amdgpu-targets): New syntax. (rocm-bandwidth-test): Update and add comprehensive build support. * gnu/local.mk: Add rocm-bandwidth-test patches. * gnu/packages/patches/rocm-bandwidth-test-fix-external-packages-search.patch, gnu/packages/patches/rocm-bandwidth-test-fix-hsa-include-file-lookup.patch, gnu/packages/patches/rocm-bandwidth-test-take-default-gpus-from-environment.patch: New files. * gnu/packages/patches/rocclr-5.6.0-enable-gfx800.patch, gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch: Update patch paths. Change-Id: I43f162b9f8ab898e25d8ecbe4ea30be84a29eb0d Signed-off-by: Ludovic Courtès <ludo@gnu.org> Signed-off-by: Rutherther <rutherther@ditigal.xyz>
59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
diff --git a/cmake/build_utils.cmake b/cmake/build_utils.cmake
|
|
index 83db1be..6f62931 100644
|
|
--- a/cmake/build_utils.cmake
|
|
+++ b/cmake/build_utils.cmake
|
|
@@ -1010,7 +1010,7 @@ macro(add_bundled_libraries)
|
|
add_subdirectory(${FMT_SOURCE_DIR} EXCLUDE_FROM_ALL)
|
|
set(FMT_LIBRARIES fmt::fmt-header-only)
|
|
else()
|
|
- find_package(${FMT_PACKAGE_NAME} REQUIRED ${FMT_PKG_MINIMUM_REQUIRED_VERSION})
|
|
+ find_package(${FMT_PACKAGE_NAME} ${FMT_PKG_MINIMUM_REQUIRED_VERSION} REQUIRED)
|
|
set(FMT_LIBRARIES fmt::fmt)
|
|
endif()
|
|
list(APPEND 3RD_PARTY_TARGET_LIST ${FMT_LIBRARIES})
|
|
@@ -1020,8 +1020,8 @@ macro(add_bundled_libraries)
|
|
# Note: C++23+ we can use std::stacktrace for the traces.
|
|
# Some older compilers/systems will not allow that. We will force/use boost::stacktrace for now.
|
|
# Check for 'Boost'
|
|
- set(BOOST_PACKAGE_NAME "boost")
|
|
- set(BOOST_LIBRARY_NAME "boost")
|
|
+ set(BOOST_PACKAGE_NAME "Boost")
|
|
+ set(BOOST_LIBRARY_NAME "Boost")
|
|
set(BOOST_REPO_URL "https://github.com/boostorg/boost.git")
|
|
set(BOOST_PKG_MINIMUM_REQUIRED_VERSION "1.74.0")
|
|
set(BOOST_REPO_VERSION "boost-1.88.0")
|
|
@@ -1128,7 +1128,7 @@ macro(add_bundled_libraries)
|
|
add_subdirectory(${SPDLOG_SOURCE_DIR} EXCLUDE_FROM_ALL)
|
|
set(SPDLOG_LIBRARIES spdlog::spdlog_header_only)
|
|
else()
|
|
- find_package(${SPDLOG_PACKAGE_NAME} REQUIRED ${SPDLOG_PKG_MINIMUM_REQUIRED_VERSION})
|
|
+ find_package(${SPDLOG_PACKAGE_NAME} ${SPDLOG_PKG_MINIMUM_REQUIRED_VERSION} REQUIRED)
|
|
set(SPDLOG_LIBRARIES spdlog::spdlog)
|
|
endif()
|
|
list(APPEND 3RD_PARTY_TARGET_LIST ${SPDLOG_LIBRARIES})
|
|
@@ -1162,7 +1162,7 @@ macro(add_bundled_libraries)
|
|
# find_package(Boost 1.74 REQUIRED COMPONENTS stacktrace_basic)
|
|
# set(BOOST_LIBRARIES boost::boost)
|
|
#endif()
|
|
- set(CATCH2_PACKAGE_NAME "catch2")
|
|
+ set(CATCH2_PACKAGE_NAME "Catch2")
|
|
set(CATCH2_LIBRARY_NAME "Catch2")
|
|
set(CATCH2_REPO_URL "https://github.com/catchorg/Catch2.git")
|
|
set(CATCH2_PKG_MINIMUM_REQUIRED_VERSION "3.5.1")
|
|
diff --git a/main/cmdline/CMakeLists.txt b/main/cmdline/CMakeLists.txt
|
|
index ad8219e..f507a2b 100644
|
|
--- a/main/cmdline/CMakeLists.txt
|
|
+++ b/main/cmdline/CMakeLists.txt
|
|
@@ -54,7 +54,7 @@ if(NOT USE_LOCAL_CLI11)
|
|
set(CLI11_LIBRARIES CLI11::CLI11)
|
|
set(CLI11_INCLUDE_DIRS)
|
|
else()
|
|
- find_package(CLI11 CONFIG QUIT)
|
|
+ find_package(CLI11 CONFIG QUIET)
|
|
endif()
|
|
|
|
|
|
--
|
|
2.51.0
|
|
|