From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QLISLaJp+2XjEgAA62LTzQ:P1 (envelope-from ) for ; Wed, 20 Mar 2024 23:56:34 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id QLISLaJp+2XjEgAA62LTzQ (envelope-from ) for ; Wed, 20 Mar 2024 23:56:34 +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=UMXLBJhZ; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710975394; 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=cdFFcmApPWpg5xvl4QDbg2OXoY50861iTo6ZjLSZ/W0Zpb1in2+5f5+D4qOeTmpz3QPHTH OYn2En+rNLr6bX2HUk93BjQq4qmF+wFTP7BOUXcDTP105K0CjLrMePIrpiPouhe/pOUEnG mFQ9ENTtF+5zoC58v3WizMnji6PBkq15q+Ly46X1fNlvtAn50RkyXTJdrbKgP9QhIDEbXN nJqFD/8QvzTWpATgezVII9WQfsoA+F/KW0FYb28luFG9MCcbEz8CpipVruPKtbsBVHC5kI E0G6aOIoEMCKIRAmHkh6Mzh7gpmk7hPPMo1oZ7UJANxWjKNOUJUvAggQ0zGTUQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=UMXLBJhZ; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710975394; a=rsa-sha256; cv=none; b=EDhzC9nVJY75/Qg4Jwa+rcMYUmqnlXHXzrOtAyMEQxRUq6YfLN7fyt5a4Nz2Nlz03Am3MI 0L4xL/SxYWqP8A2tgv9sa1SAQ11T/6T+QVvNFZ3UaYpn3MC2aaPcAoSR2r20adXuU4fDeW sqhxJALMfJYdk45YMEeb/nvhvatJtDoLcHSwpAREsG0v1LW9usHE4s9e+6JHeaBdh80JL+ xIu/ZFDTeRRCV8R9FYfvO/LuUYL6tOTwPpREYhUBLO3BRIfsknvV3cpHIAMWN8Dir5xbGG 4j+OFltAp+tajqM460WxA1kwbiy1/KOvBVTB1Yy3FO2I+Tm8eGbThI/6ggtHgw== 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 7A8CE63E58 for ; Wed, 20 Mar 2024 23:56:34 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rn4bx-00062V-Il; Wed, 20 Mar 2024 18:40:41 -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 1rn4bn-0005xn-Gq for guix-patches@gnu.org; Wed, 20 Mar 2024 18:40:31 -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 1rn4bn-0007cm-0W for guix-patches@gnu.org; Wed, 20 Mar 2024 18:40:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rn4cO-0006Dh-Ga for guix-patches@gnu.org; Wed, 20 Mar 2024 18:41:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v3 14/32] gnu: cpuinfo: Update to commit aa4b216. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Mar 2024 22:41:08 +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.171097442823588 (code B ref 69591); Wed, 20 Mar 2024 22:41:08 +0000 Received: (at 69591) by debbugs.gnu.org; 20 Mar 2024 22:40:28 +0000 Received: from localhost ([127.0.0.1]:36813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn4bj-00068I-Rk for submit@debbugs.gnu.org; Wed, 20 Mar 2024 18:40:28 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn4bN-00063D-6u for 69591@debbugs.gnu.org; Wed, 20 Mar 2024 18:40:06 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 92E5B240101 for <69591@debbugs.gnu.org>; Wed, 20 Mar 2024 23:39:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710974358; bh=DaiUBW+x58c0jsoKdIveCaRofAAIYagdmwvRSfc6O4Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=UMXLBJhZZ+ZBMbPtcCwz1Ae+HDpbqOt8i/8Fzp6n9pOFcfTMka8spqVpCbLx+xZ5B 0pjHELY+NnIZubLgNFiRB+xj0IkeSJX+A253+c3tHME4+mVlbxtyCGCaMkon9yhBMp sZ0M4lBryFZh7Hy/EPh5J1c/Sb4YFJpfuXOst4MbbSa0zQqKLX93i3LSF5Oc8q/QEw 3Wq58JK0sYJz+A9wi+UZsuLuULkYdGGvRJ+hNnjna5XvJmRUfLa9wa6Fk/0p35CcZs LfLlbEOoclQ58AdDIHecf6SS46C4iAmdev24FTtWsEObPKh0U9sUmTIdydACReaF1J QQIl5gi47ubMg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V0Nn22PLxz6tn4; Wed, 20 Mar 2024 23:39:18 +0100 (CET) From: David Elsing Date: Wed, 20 Mar 2024 22:38:39 +0000 Message-ID: <20240320223906.13214-14-david.elsing@posteo.net> In-Reply-To: <20240320223737.12883-1-david.elsing@posteo.net> References: <20240320223737.12883-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-Spam-Score: -3.92 X-Spam-Score: -3.92 X-Migadu-Queue-Id: 7A8CE63E58 X-Migadu-Scanner: mx12.migadu.com X-TUID: UfsiikXqT3n9 * 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