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.
This commit is contained in:
		
							parent
							
								
									b95c7203ea
								
							
						
					
					
						commit
						ab6e8ecbb5
					
				
					 3 changed files with 9 additions and 56 deletions
				
			
		|  | @ -1084,7 +1084,6 @@ dist_patch_DATA =						\ | ||||||
|   %D%/packages/patches/coreutils-gnulib-tests.patch		\
 |   %D%/packages/patches/coreutils-gnulib-tests.patch		\
 | ||||||
|   %D%/packages/patches/cppcheck-disable-char-signedness-test.patch	\
 |   %D%/packages/patches/cppcheck-disable-char-signedness-test.patch	\
 | ||||||
|   %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.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/cpulimit-with-glib-2.32.patch		\
 | ||||||
|   %D%/packages/patches/crawl-upgrade-saves.patch		\
 |   %D%/packages/patches/crawl-upgrade-saves.patch		\
 | ||||||
|   %D%/packages/patches/crc32c-unbundle-googletest.patch		\
 |   %D%/packages/patches/crc32c-unbundle-googletest.patch		\
 | ||||||
|  |  | ||||||
|  | @ -489,8 +489,8 @@ features.") | ||||||
| (define-public cpuinfo | (define-public cpuinfo | ||||||
|   ;; There's currently no tag on this repo. |   ;; There's currently no tag on this repo. | ||||||
|   (let ((version "0.0") |   (let ((version "0.0") | ||||||
|         (revision "2") |         (revision "3") | ||||||
|         (commit "53298db833c5c5a1598639e9b47cc1a602bbac26")) |         (commit "aa4b2163b99ac9534194520f70b93eeefb0b3b4e")) | ||||||
|     (package |     (package | ||||||
|       (name "cpuinfo") |       (name "cpuinfo") | ||||||
|       (version (git-version version revision commit)) |       (version (git-version version revision commit)) | ||||||
|  | @ -501,12 +501,13 @@ features.") | ||||||
|                 (file-name (git-file-name name version)) |                 (file-name (git-file-name name version)) | ||||||
|                 (sha256 |                 (sha256 | ||||||
|                  (base32 |                  (base32 | ||||||
|                   "01kfgxya2w32dz9bd3qm3i2d6nffw0qfyql11rxl7d3g830brj5k")) |                   "12x4krkyzxngf1l2ck33lnsp8pyzf6gyjj9mp9cnka9mw3h6617m")))) | ||||||
|                 (patches (search-patches "cpuinfo-system-libraries.patch")))) |  | ||||||
|       (build-system cmake-build-system) |       (build-system cmake-build-system) | ||||||
|       (arguments |       (arguments | ||||||
|        (list |        (list | ||||||
|         #:configure-flags '(list "-DBUILD_SHARED_LIBS=ON") |         #:configure-flags | ||||||
|  |         '(list "-DBUILD_SHARED_LIBS=ON" | ||||||
|  |                "-DUSE_SYSTEM_LIBS=ON") | ||||||
|         #:phases |         #:phases | ||||||
|         '(modify-phases %standard-phases |         '(modify-phases %standard-phases | ||||||
|            (add-after 'unpack 'skip-bad-test |            (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 |        "The cpuinfo library provides a C/C++ and a command-line interface to | ||||||
| obtain information about the CPU being used: supported instruction set, | obtain information about the CPU being used: supported instruction set, | ||||||
| processor name, cache information, and topology information.") | 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)))) |       (license license:bsd-2)))) | ||||||
| 
 | 
 | ||||||
| (define-public clog | (define-public clog | ||||||
|  |  | ||||||
|  | @ -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") |  | ||||||
		Reference in a new issue