From patchwork Tue Jan 10 09:04:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 46011 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 7D13527BBE9; Tue, 10 Jan 2023 09:16:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 AA24227BBE9 for ; Tue, 10 Jan 2023 09:16:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFAZK-0000KM-Qs; Tue, 10 Jan 2023 04:05:18 -0500 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 1pFAZ4-0000Bi-IT for guix-patches@gnu.org; Tue, 10 Jan 2023 04:05:13 -0500 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 1pFAZ4-00079i-9c for guix-patches@gnu.org; Tue, 10 Jan 2023 04:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFAZ3-0007zf-Vb for guix-patches@gnu.org; Tue, 10 Jan 2023 04:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60706] [PATCH] gnu: hwloc: Update to 2.9.0. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Jan 2023 09:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60706 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60706@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167334146930682 (code B ref -1); Tue, 10 Jan 2023 09:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2023 09:04:29 +0000 Received: from localhost ([127.0.0.1]:38760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFAYW-0007yo-S1 for submit@debbugs.gnu.org; Tue, 10 Jan 2023 04:04:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:49400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFAYU-0007yf-Df for submit@debbugs.gnu.org; Tue, 10 Jan 2023 04:04:28 -0500 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 1pFAYT-0008U2-GT for guix-patches@gnu.org; Tue, 10 Jan 2023 04:04:26 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFAYS-00076G-Ab; Tue, 10 Jan 2023 04:04:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=p4nulBc3AfEs+gaAZTSnZJiLTc4oL0wfcywrHyYzC5s=; b=pWS5k3YntHS3lp vKSmkKm9LFW35+wcWB84GlXh3FYAY2SKhDvPQEnvZCUYSytdttcoVYC7csqxtavPX25ulQpmBd5tK 38IkCzadasGtbzT3r22IjkYOsZgUHeXhVFKaGzL+DFK75X727KAS+Jr8MJIMCrtMmokP6y8lisW1T es1DSy1HABkp7bumxaVtbGS8MrvXstXVbioWw553w3M6lyPm0+paeZRZXlGBGUT9YnvGITGRQ+Cdx xCBGZvRxZdb1mDxjZkLPxyLpAXuQClhH/Yg/Qi1BPGWKR6exA5doW3PgaGvZssuYifhxXa3ficxtx o2aCEQOAsRxWsL75FF8w==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFAYR-0001hR-BR; Tue, 10 Jan 2023 04:04:23 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 10 Jan 2023 10:04:14 +0100 Message-Id: <20230110090414.32124-1-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 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 From: Ludovic Courtès * gnu/packages/mpi.scm (hwloc-2): Update to 2.9.0. [arguments]: Add 'skip-test-that-requires-/sys' phase. --- gnu/packages/mpi.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) base-commit: 84f117f49587b608b287827793b1b8036d2cff7f diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index af2409aeab..56b7d04209 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier -;;; Copyright © 2014-2022 Ludovic Courtès +;;; Copyright © 2014-2023 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love @@ -143,7 +143,7 @@ (define-public hwloc-2 ;; Note: 2.x isn't the default yet, see above. (package (inherit hwloc-1) - (version "2.8.0") + (version "2.9.0") (source (origin (method url-fetch) (uri (string-append "https://download.open-mpi.org/release/hwloc/v" @@ -151,7 +151,7 @@ (define-public hwloc-2 "/hwloc-" version ".tar.bz2")) (sha256 (base32 - "1ha23yqfx9kfxm5fcj9m0fnyf0r2k6p4k88xxqishclcsky752il")))) + "11v8hnl6fdsdbm3wnz5gg88f2ghixjyl7jlfmywj293ab5iyjw10")))) ;; libnuma is no longer needed. (inputs (modify-inputs (package-inputs hwloc-1) @@ -167,6 +167,10 @@ (define-public hwloc-2 (substitute* "tests/hwloc/linux-libnuma.c" (("numa_available\\(\\)") "-1")))) + (add-before 'check 'skip-test-that-requires-/sys + (lambda _ + ;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it. + (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: