diff options
author | David Elsing <[email protected]> | 2024-03-23 22:04:53 +0000 |
---|---|---|
committer | Ludovic Courtès <[email protected]> | 2024-06-18 11:41:25 +0200 |
commit | ab6e8ecbb5d0ae24528e9de8b1604bb1d158c16a (patch) | |
tree | 1bd93dc751243bbe1a34dde75cfd4e66e4fe959d /gnu/packages/patches/cpuinfo-system-libraries.patch | |
parent | b95c7203ea026e539835f8b50bc766d9609b8f0c (diff) |
gnu: cpuinfo: Update to commit aa4b216.
* gnu/packages/parallel.scm (cpuinfo): Update to commit aa4b216.
[arguments]: Set the "-DUSE_SYSTEM_LIBS=ON" configure flag instead of using a
patch.
[supported-systems]: New field.
* gnu/packages/patches/cpuinfo-system-libraries.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches/cpuinfo-system-libraries.patch')
-rw-r--r-- | gnu/packages/patches/cpuinfo-system-libraries.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/gnu/packages/patches/cpuinfo-system-libraries.patch b/gnu/packages/patches/cpuinfo-system-libraries.patch deleted file mode 100644 index e25446e9da..0000000000 --- a/gnu/packages/patches/cpuinfo-system-libraries.patch +++ /dev/null @@ -1,50 +0,0 @@ -This patch allows the build process to use the provided dependencies instead -of adding their source as CMake sub-directories (in which case "make install" -would install googletest's and googlebenchmark's libraries and headers). - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 57abc26..761c612 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,7 +93,7 @@ SET(CONFU_DEPENDENCIES_BINARY_DIR ${CMAKE_BINARY_DIR}/deps - CACHE PATH "Confu-style dependencies binary directory") - - IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS) -- IF(CPUINFO_SUPPORTED_PLATFORM AND NOT DEFINED GOOGLETEST_SOURCE_DIR) -+ IF(FALSE) - MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)") - CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt") - EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -@@ -105,7 +105,7 @@ IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS) - ENDIF() - - IF(CPUINFO_BUILD_BENCHMARKS) -- IF(CPUINFO_SUPPORTED_PLATFORM AND NOT DEFINED GOOGLEBENCHMARK_SOURCE_DIR) -+ IF(FALSE) - MESSAGE(STATUS "Downloading Google Benchmark to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googlebenchmark (define GOOGLEBENCHMARK_SOURCE_DIR to avoid it)") - CONFIGURE_FILE(cmake/DownloadGoogleBenchmark.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark-download/CMakeLists.txt") - EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -@@ -271,14 +271,6 @@ INSTALL(TARGETS cpuinfo - - # ---[ cpuinfo micro-benchmarks - IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_BENCHMARKS) -- # ---[ Build google benchmark -- IF(NOT TARGET benchmark) -- SET(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "") -- ADD_SUBDIRECTORY( -- "${GOOGLEBENCHMARK_SOURCE_DIR}" -- "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark") -- ENDIF() -- - IF(CMAKE_SYSTEM_NAME MATCHES "^(Linux|Android)$") - ADD_EXECUTABLE(get-current-bench bench/get-current.cc) - TARGET_LINK_LIBRARIES(get-current-bench cpuinfo benchmark) -@@ -289,7 +281,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_BENCHMARKS) - ENDIF() - - IF(CPUINFO_SUPPORTED_PLATFORM) -- IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS) -+ IF(FALSE) - # ---[ Build google test - IF(NOT TARGET gtest) - IF(MSVC AND NOT CPUINFO_RUNTIME_TYPE STREQUAL "static") |