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/packages/parallel.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages/parallel.scm') 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 -- cgit v1.2.3