[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69591] [PATCH 14/31] gnu: cpuinfo: Update to commit aa4b216.
From: |
David Elsing |
Subject: |
[bug#69591] [PATCH 14/31] gnu: cpuinfo: Update to commit aa4b216. |
Date: |
Wed, 6 Mar 2024 19:40:20 +0000 |
* gnu/packages/parallel.scm (cpuinfo): Update to commit aa4b216.
[arguments]: Set the "-DUSE_SYSTEM_LIBS=ON" configure flag instead of using a
patch.
* 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 | 11 ++--
.../patches/cpuinfo-system-libraries.patch | 50 -------------------
3 files changed, 6 insertions(+), 56 deletions(-)
delete mode 100644 gnu/packages/patches/cpuinfo-system-libraries.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 06b3238684..c290d91cbb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1065,7 +1065,6 @@ dist_patch_DATA =
\
%D%/packages/patches/cool-retro-term-wctype.patch \
%D%/packages/patches/coreutils-gnulib-tests.patch \
%D%/packages/patches/cppcheck-disable-char-signedness-test.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 4e8ca9af35..4dc0bee898 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -479,8 +479,8 @@ (define-public pthreadpool
(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))
@@ -491,12 +491,13 @@ (define-public cpuinfo
(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
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")
--
2.41.0
- [bug#69591] [PATCH 02/31] gnu: Add python-typing-extensions-4.10., (continued)
- [bug#69591] [PATCH 02/31] gnu: Add python-typing-extensions-4.10., David Elsing, 2024/03/06
- [bug#69591] [PATCH 05/31] gnu: Add python-pytest-shard., David Elsing, 2024/03/06
- [bug#69591] [PATCH 04/31] gnu: Add python-pytest-flakefinder., David Elsing, 2024/03/06
- [bug#69591] [PATCH 07/31] gnu: Add python-pytest-rerunfailures-13., David Elsing, 2024/03/06
- [bug#69591] [PATCH 09/31] gnu: Add miniz-for-pytorch., David Elsing, 2024/03/06
- [bug#69591] [PATCH 10/31] gnu: Add libnop., David Elsing, 2024/03/06
- [bug#69591] [PATCH 06/31] gnu: Add python-expecttest., David Elsing, 2024/03/06
- [bug#69591] [PATCH 08/31] gnu: Add miniz., David Elsing, 2024/03/06
- [bug#69591] [PATCH 11/31] gnu: Remove flatbuffers-next-shared., David Elsing, 2024/03/06
- [bug#69591] [PATCH 16/31] gnu: nnpack: Update to commit 70a77f4., David Elsing, 2024/03/06
- [bug#69591] [PATCH 14/31] gnu: cpuinfo: Update to commit aa4b216.,
David Elsing <=
- [bug#69591] [PATCH 12/31] gnu: python-flatbuffers-next: Update to 23.5.26., David Elsing, 2024/03/06
- [bug#69591] [PATCH 22/31] gnu: Add ideep-pytorch., David Elsing, 2024/03/06
- [bug#69591] [PATCH 13/31] gnu: pthreadpool: Update to commit 178e3e0., David Elsing, 2024/03/06
- [bug#69591] [PATCH 23/31] gnu: xnnpack: Update to commit 51a9875., David Elsing, 2024/03/06
- [bug#69591] [PATCH 15/31] gnu: clog: Add "-DUSE_SYSTEM_LIBS=ON" configure flag., David Elsing, 2024/03/06
- [bug#69591] [PATCH 20/31] gnu: Add qnnpack., David Elsing, 2024/03/06
- [bug#69591] [PATCH 17/31] gnu: oneapi-dnnl: Update to 3.3.5., David Elsing, 2024/03/06
- [bug#69591] [PATCH 25/31] gnu: Add qnnpack-pytorch., David Elsing, 2024/03/06
- [bug#69591] [PATCH 19/31] gnu: Add fbgemm., David Elsing, 2024/03/06
- [bug#69591] [PATCH 30/31] gnu: Add qnnpack-pytorch-for-r-torch., David Elsing, 2024/03/06