From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id AJIDM9VW/2USKwEAe85BDQ:P1 (envelope-from ) for ; Sat, 23 Mar 2024 23:25:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id AJIDM9VW/2USKwEAe85BDQ (envelope-from ) for ; Sat, 23 Mar 2024 23:25:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=UndJcqIf; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711232725; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=QLrqsZE7MBp+fa+CvEg/iwNJPsOeZ1C38t8AzITyvIs=; b=kNrsjBudOqOEUDNyAVH9AOAoOFTiqjP5K8Cp0sK7xr333gQk8xLe1XdN6sxkLy//GjEhHJ g6m7e9fIUUHDoJl88berkaBQlKt+vw0FpfzGZLiuIAetnSSxAzxlpmv0CzPczKog02DbBK 2Gn9lZc/iNJPh8UNzlUdJHqlXAqkaFadEScG2g2Y0JXHn1yItPOVEyksMbLBCyFs9MRKPg QZjuCQgORH+RexLT/+SkawHTseW0rppS2OmmjkHLGbBVAzMDTNnpKvBKg2MqHnB547jeim IYHxRYS4jGnr++sJk6tz2K/1JKtpcvYKZHRV9TitRgaSuZwio8psPTqHr4euCA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=UndJcqIf; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711232725; a=rsa-sha256; cv=none; b=BcXQO/jjV8dh7U4zWesiZzFMuuKyBIsrn4Dxk4mzhMu1bxDnqTbPEWVGbeeJgdVqG6LtM2 lK8rwF2qufoCripahr2GZliQpV1JWCeulgjkmQgl/BSmTetg9BOhCNwxJnXRtE3TyN3zij QnC7cA2RYnVp0HcIUFblB4xSopRrsjSIXqz7Duel2wNSUKR6W/B3QGmtOcAFdxtUi4iNFD nMn8H/EqN2ITEAD3h6j5hMKURHoWRe8gMASqcULvj9JzF5WZpAo22NJHCZidKacKfMKozt JbglKn6SOpIctQIfQVCGTUBYFOrMdAP5glJkhIKp1TS+J9dT6LHvxSU4jsvecQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8C901845C for ; Sat, 23 Mar 2024 23:25:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ro9nl-0000zz-H6; Sat, 23 Mar 2024 18:25:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ro9nk-0000zm-Jw for guix-patches@gnu.org; Sat, 23 Mar 2024 18:25:20 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ro9nk-0003v8-BN for guix-patches@gnu.org; Sat, 23 Mar 2024 18:25:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ro9oP-0007FQ-Mj for guix-patches@gnu.org; Sat, 23 Mar 2024 18:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v4 14/32] gnu: cpuinfo: Update to commit aa4b216. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Mar 2024 22:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69591@debbugs.gnu.org Cc: David Elsing Received: via spool by 69591-submit@debbugs.gnu.org id=B69591.171123272227772 (code B ref 69591); Sat, 23 Mar 2024 22:26:01 +0000 Received: (at 69591) by debbugs.gnu.org; 23 Mar 2024 22:25:22 +0000 Received: from localhost ([127.0.0.1]:57484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ro9nl-0007Dq-JF for submit@debbugs.gnu.org; Sat, 23 Mar 2024 18:25:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ro9dM-0006lL-SR for 69591@debbugs.gnu.org; Sat, 23 Mar 2024 18:14:38 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 192BE240027 for <69591@debbugs.gnu.org>; Sat, 23 Mar 2024 23:05:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711231528; bh=DaiUBW+x58c0jsoKdIveCaRofAAIYagdmwvRSfc6O4Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=UndJcqIfaJkYYrPCx0HqL+TapfB4uGmatZvgtRWgwEAhbhV9J3X9hqg61MbzW8G9L l0Lms/GE1x7OLnFTEJ5eF+G+uhIeK1SWj3NfgAb9y9BtCkOnZhwX/sQrl7kOhz06J9 LewWhBfH9Thl5LcAFFc9G2RKtNGkv3Yh10r5DwkqdSreyhwqILHmufREwCAQ+A/GVX bCCJ+q9Nm0nqKU5Ljz5ae2X0FIRVWru8bTqW1PuQ6JNO4j4MTgvbQD1aJpimtV1Q7R 9Y04I+vUYLbF1ryr55H+Q7uuCijfU0zkX0k07x+qH8ijrjDQsEEG2n9gwTXXLXZR/E Lo278KhV/vyNQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V2Ctb5Xzgz6tx0; Sat, 23 Mar 2024 23:05:27 +0100 (CET) From: David Elsing Date: Sat, 23 Mar 2024 22:04:53 +0000 Message-ID: <20240323220518.25063-14-david.elsing@posteo.net> In-Reply-To: <20240323214040.20221-1-david.elsing@posteo.net> References: <20240323214040.20221-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 8C901845C X-Spam-Score: -3.93 X-Migadu-Spam-Score: -3.93 X-Migadu-Scanner: mx10.migadu.com X-TUID: 5OYaHMewQkX4 * 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 ca83a84ea2..474260b764 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1068,7 +1068,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 e1cbe52934..4238312367 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -480,8 +480,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)) @@ -492,12 +492,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 @@ -513,6 +514,9 @@ (define-public cpuinfo "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") -- 2.41.0