From patchwork Mon Apr 3 09:46:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe SWARTVAGHER X-Patchwork-Id: 48959 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8D53E172B8; Mon, 3 Apr 2023 10:48:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DFFE61701D for ; Mon, 3 Apr 2023 10:48:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjGnE-0001vF-Rf; Mon, 03 Apr 2023 05:48:04 -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 1pjGnC-0001ux-MX for guix-patches@gnu.org; Mon, 03 Apr 2023 05:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjGnC-0003hF-D7 for guix-patches@gnu.org; Mon, 03 Apr 2023 05:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pjGnC-0008I1-6f for guix-patches@gnu.org; Mon, 03 Apr 2023 05:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62641] [PATCH] gnu: hwloc: Update to 2.9.1. Resent-From: Philippe SWARTVAGHER Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Apr 2023 09:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62641@debbugs.gnu.org Cc: Philippe SWARTVAGHER X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168051522331623 (code B ref -1); Mon, 03 Apr 2023 09:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2023 09:47:03 +0000 Received: from localhost ([127.0.0.1]:43360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pjGmE-0008Dz-K7 for submit@debbugs.gnu.org; Mon, 03 Apr 2023 05:47:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:40756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pjGmC-0008DZ-HL for submit@debbugs.gnu.org; Mon, 03 Apr 2023 05:47:01 -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 1pjGmC-0001qV-22 for guix-patches@gnu.org; Mon, 03 Apr 2023 05:47:00 -0400 Received: from mout.gmx.net ([212.227.15.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjGm9-0003WK-Mh for guix-patches@gnu.org; Mon, 03 Apr 2023 05:46:59 -0400 Received: from PHSW-LAPTOP.par.tuwien.ac.at ([128.130.171.175]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MC30Z-1pZcnr0wof-00CNGb; Mon, 03 Apr 2023 11:46:54 +0200 From: Philippe SWARTVAGHER Date: Mon, 3 Apr 2023 11:46:19 +0200 Message-Id: <20230403094619.73375-1-phil.swart@gmx.fr> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:HlgL1IM8HDS84EfHQbLseB3q17k0sZ+QEapqf2ZMRneuNLFKr66 dTlwZDGDJVXMV5thUirbq25hHVc6oJFHeVcP4LOTh65XK8W+Ufu0GeS1S50to/6M3dcIO5I 07gPhf9qD7gi0nNDfuLX/93+qhG5zcr6n7gHvP/vQ3IfGSa5/xXgd8JueSZy7tsAcAXBrRd Va8uHfCaHrblEAZsOaMZQ== UI-OutboundReport: notjunk:1;M01:P0:q/madISCN8Q=;USSsV4hZI7nFQsOOCgSibDi65e3 cicKGP/sYF2/jwxt7W0lCb6pSjUwz3kWJ07w3dpPWC3/WPwDL+74AQQtkX+w/yLBbtcQekhxz afbD1aByDuwqD/MipbfvjTqiMxsIWvTy+bNG2XwXbsNEdeiZwpeT/qVtS5hL1yxxYEZ5P3plq AhhI2OIuMCpbFr1XyzHkVJNWkpqWPmrBnIsXPXeJ4NMAtZu477CSnlLphor3+7JTPeqWhsNu7 dJVLyX0Ia5rSF3fqZ3LhTkZV9o44EprpDEXO+aR9PJ0mBr8SxA7DJ7Bphgl8ihgL42vVEduHp Az3dYjM015Pw1yTL40W96mQq90CXrN23SKBPZ9VUF/Pjxvv/XkzYfJVGemh0GXvBCr+i2Qz/V edCm/5evQsc1gC58X5FeOottA+5alsiVkRH0E5RmJGGwjgwRiaARK+NXXWkbSHiMMNmuXrxQS VBcI7nyXFt0hxFQBfe1YCYU34U2x5WId1nPyDpetxpxXqgLGgywzimU7LY+hUFx71rE3FmQQf HOQfPh+c4ZEoxpH8n5abpUnmS6Wig9o2vtvlZ2Mns9WP7A+t5b1qz36Fe+ie7keQkVMpDrl5I mC9h5GUY6/fLHFjvemXoIRotY0k84SdCzhlWD5U219bDrQtmJTWxuEncLZloLHsyJXxeeMUv4 7LAxjmeZaudJbLi81BmTb5Bgu5t3hyf2RUqUhR67nd5bwGJyC0QOSbri6cHVACT3BTB7BFuih JylCI7HrW9UY0atQjaE3RdyGOwbqmIonkKPRHqfaRLeiaK3vL37FbekZ009ObriizhrlJNh0G zBZba26OYy884rt+AWKtkRAVw1CuObyb2jbj8/doQkUcc3tuGn/J6VNvBvDHNNA9vv5JjFrwH rR98NEhq9GVQ98+DI6K7m21OId1LOiqtpmWACLzejW5gfYyrgxp/smINW7tipOCLhFPGsJqfy D3qExCvffmxibgn0Pv8OwKTFbKI= Received-SPF: pass client-ip=212.227.15.18; envelope-from=phil.swart@gmx.fr; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mpi.scm (hwloc-2): Update to 2.9.1. Patch to skip tests requiring /sys on non-x86 systems should not be necessary anymore, as https://github.com/open-mpi/hwloc/pull/570 has been merged in this new version. --- gnu/packages/mpi.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) base-commit: 1d0158ab9036cff7737cbfb1678f876ae67c4ac2 diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index baef62616f..6faa47c669 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -141,7 +141,7 @@ (define-public hwloc-1 (define-public hwloc-2 (package (inherit hwloc-1) - (version "2.9.0") + (version "2.9.1") (source (origin (method url-fetch) (uri (string-append "https://download.open-mpi.org/release/hwloc/v" @@ -149,7 +149,7 @@ (define-public hwloc-2 "/hwloc-" version ".tar.bz2")) (sha256 (base32 - "11v8hnl6fdsdbm3wnz5gg88f2ghixjyl7jlfmywj293ab5iyjw10")))) + "17jr14a5ns5rpwvy28fy7xqagbvfprsz7wrsjgh5gx7y40d97i3w")))) ;; libnuma is no longer needed. (inputs (modify-inputs (package-inputs hwloc-1) @@ -168,16 +168,7 @@ (define-public hwloc-2 (add-before 'check 'skip-tests-that-require-/sys (lambda _ ;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it. - (setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0") - - ;; 'hwloc_backends' also requires /sys on non-x86 systems, for - ;; which hwloc lacks a topology backend not reliant on the - ;; operating system; skip it also on these machines. - (substitute* "tests/hwloc/hwloc_backends.c" - ,@(if (not (target-x86?)) - '((("putenv\\(\\(char \\*\\) \"HWLOC_L" all) - (string-append "exit (77);\n" all))) - '())))) + (setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0"))) (add-before 'check 'skip-test-that-fails-on-qemu (lambda _ ;; Skip test that fails on emulated hardware due to QEMU bug: