From patchwork Mon Jul 29 17:36:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Cirrottola X-Patchwork-Id: 29596 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 DDFDB27BBE9; Mon, 29 Jul 2024 18:37:24 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 64DFB27BBE2 for ; Mon, 29 Jul 2024 18:37:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYUIr-0006YP-FT; Mon, 29 Jul 2024 13:36:57 -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 1sYUIk-0006XL-Gt for guix-patches@gnu.org; Mon, 29 Jul 2024 13:36:50 -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 1sYUIk-0004oT-7S for guix-patches@gnu.org; Mon, 29 Jul 2024 13:36:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=a21HlVccDqcR30hAC+cJFo480pn7bnIxzwOB7sXxmWo=; b=A1k1nXhd/OaeeeKB70PkH8HbUEVKiX+4qs2FHlGTvAYSftZ4T55piKZ5h85VSUhD6GOWWpBAtHojvw9ST/Nl5j/Oih4o/88/waxTEql1NihHAA4OwX5O1tFeB2/fonGIlnNBsfOrT9vcXKG1Z1oir0ezkO3fveaOzZHKI15QxtE7WS78Lh8qDruUXxfIjXCpzkaQTWa0u6oF7wW+9jnigJ4LU6Lc0ElljWOErSELrvK1ruiE66wGbRuI3CyXOZQvDbD9Zd64nB85CG58XgdO4dhPKGdPRFmjymcjgeAJ1FEYUnLz9nvFLLP86geGKoVQ6Oky+to8wXtc1SvfQO/FKA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sYUIx-0001z8-7x for guix-patches@gnu.org; Mon, 29 Jul 2024 13:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72071] [PATCH 2/2] Skip test_check_version since the patch-settings phase needs to modify the test reference file. Resent-From: Luca Cirrottola Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jul 2024 17:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72071@debbugs.gnu.org Cc: Luca Cirrottola Received: via spool by 72071-submit@debbugs.gnu.org id=B72071.17222746077595 (code B ref 72071); Mon, 29 Jul 2024 17:37:03 +0000 Received: (at 72071) by debbugs.gnu.org; 29 Jul 2024 17:36:47 +0000 Received: from localhost ([127.0.0.1]:46277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYUIh-0001yM-9U for submit@debbugs.gnu.org; Mon, 29 Jul 2024 13:36:47 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:1833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYUIe-0001xh-8s for 72071@debbugs.gnu.org; Mon, 29 Jul 2024 13:36:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=a21HlVccDqcR30hAC+cJFo480pn7bnIxzwOB7sXxmWo=; b=VVG0BlAGF8KkBqDRwc4S8KtidcgSGBiNtbGCVQbCyjpD5G/7QbD+6kiZ ntpzd+ig5I3Kz+UAHmqcsZylhz9EBgt36DfJoVgied4RwnfB5fNJOY/nu c28/H5RMM4ZiEZF4oaoSbt2ixFZNu+wdrNsCkNQ4FR0/5Hgi8IMao9SD4 s=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=luca.cirrottola@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.09,246,1716242400"; d="scan'208";a="93204230" Received: from unknown (HELO canard.bordeaux.inria.fr) ([193.50.110.147]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2024 19:36:28 +0200 From: Luca Cirrottola Date: Mon, 29 Jul 2024 19:36:04 +0200 Message-Id: <20240729173604.220603-3-luca.cirrottola@inria.fr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240729173604.220603-1-luca.cirrottola@inria.fr> References: <20240729173604.220603-1-luca.cirrottola@inria.fr> 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 --- gnu/packages/maths.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8116569bca..4e69fb1eb9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1728,7 +1728,12 @@ (define-public hdf5-1.8 (substitute* "hl/fortran/src/Makefile.in" (("libhdf5hl_fortran_la_LDFLAGS =") (string-append "libhdf5hl_fortran_la_LDFLAGS = -Wl,-rpath=" - (assoc-ref outputs "fortran") "/lib"))))) + (assoc-ref outputs "fortran") "/lib"))) + ;; Skip test_check_version since the "patch-settings" phase + ;; will modify the test reference. + (substitute* "test/test_check_version.sh.in" + (("TESTING\\(\\).*" all) + (string-append all "\nSKIP; exit 0\n"))))) (add-after 'configure 'patch-settings (lambda _ ;; libhdf5.settings contains the full path of the