From ab6e8ecbb5d0ae24528e9de8b1604bb1d158c16a Mon Sep 17 00:00:00 2001 From: David Elsing Date: Sat, 23 Mar 2024 22:04:53 +0000 Subject: 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. --- gnu/local.mk | 1 - gnu/packages/parallel.scm | 14 +++--- .../patches/cpuinfo-system-libraries.patch | 50 ---------------------- 3 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/cpuinfo-system-libraries.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5a4149cf23..5a1665326e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1084,7 +1084,6 @@ dist_patch_DATA = \ %D%/packages/patches/coreutils-gnulib-tests.patch \ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ - %D%/packages/patches/cpuinfo-system-libraries.patch \ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crc32c-unbundle-googletest.patch \ diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 429665091a..e8ef8c3e9b 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -489,8 +489,8 @@ features.") (define-public cpuinfo ;; There's currently no tag on this repo. (let ((version "0.0") - (revision "2") - (commit "53298db833c5c5a1598639e9b47cc1a602bbac26")) + (revision "3") + (commit "aa4b2163b99ac9534194520f70b93eeefb0b3b4e")) (package (name "cpuinfo") (version (git-version version revision commit)) @@ -501,12 +501,13 @@ features.") (file-name (git-file-name name version)) (sha256 (base32 - "01kfgxya2w32dz9bd3qm3i2d6nffw0qfyql11rxl7d3g830brj5k")) - (patches (search-patches "cpuinfo-system-libraries.patch")))) + "12x4krkyzxngf1l2ck33lnsp8pyzf6gyjj9mp9cnka9mw3h6617m")))) (build-system cmake-build-system) (arguments (list - #:configure-flags '(list "-DBUILD_SHARED_LIBS=ON") + #:configure-flags + '(list "-DBUILD_SHARED_LIBS=ON" + "-DUSE_SYSTEM_LIBS=ON") #:phases '(modify-phases %standard-phases (add-after 'unpack 'skip-bad-test @@ -522,6 +523,9 @@ GTEST_SKIP() << \"See https://github.com/pytorch/cpuinfo/issues/132\";")))))))) "The cpuinfo library provides a C/C++ and a command-line interface to obtain information about the CPU being used: supported instruction set, processor name, cache information, and topology information.") + ;; On aarch64-linux, there is a bug reported upstream: + ;; https://github.com/pytorch/cpuinfo/issues/14 + (supported-systems '("armv7-linux" "i686-linux" "x86_64-linux")) (license license:bsd-2)))) (define-public clog 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") -- cgit v1.2.3