From patchwork Tue Apr 22 15:31:47 2025 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: 41939 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 C7EDC27BC4A; Tue, 22 Apr 2025 16:34:01 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 2230027BC49 for ; Tue, 22 Apr 2025 16:34:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7FdF-0005F6-2M; Tue, 22 Apr 2025 11:33: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 1u7FcR-00052F-Fu for guix-patches@gnu.org; Tue, 22 Apr 2025 11:33:21 -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 1u7FcP-0001h2-NQ for guix-patches@gnu.org; Tue, 22 Apr 2025 11:33:06 -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=mwHGmD/mYqHEPW5rIRiHRUsNoZV9zkmxXl9yeRjTn4U=; b=owT81gmWN+avoG6eohxbxVs7yMYHBmGDEAdUhq60Dw7O9JJ1F4DARiqtjIE/F/pxzX4iuPelHBgsMcwi+bsx/MIF9Xq9rl+2YVFsC6Ceq0V26/ACgPwFoodFFMhy++SZi9p+eMYFeTvcNB85D5G+YVqaiLSm5MkaobDjTdUjWjjWWQxlPbGFYfjWIHkIG2EZ5KBID8N1ALR9hP9hubKX/Eilz3Gw2AElTec0zWI1uIysvrH1gQ+AMgPj5wEPtpU+T26oZ2iq2GmmHkpj+avKn1k/fS53t9L6o1FJCXYZ/3uKQ3zn2kAMScSCufUiVAScZhJsn0WdaO4+VZkY49Aa1w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7FcM-0001KJ-OZ; Tue, 22 Apr 2025 11:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77991] [PATCH 1/4] gnu: scotch: Remove =?utf-8?b?4oCcLXNoYXJl?= =?utf-8?b?ZOKAnQ==?= deprecated aliases. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 22 Apr 2025 15:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77991 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77991@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 77991-submit@debbugs.gnu.org id=B77991.17453359294966 (code B ref 77991); Tue, 22 Apr 2025 15:33:02 +0000 Received: (at 77991) by debbugs.gnu.org; 22 Apr 2025 15:32:09 +0000 Received: from localhost ([127.0.0.1]:49449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FbU-0001Hw-GU for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40262) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FbR-0001H3-HB for 77991@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:06 -0400 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 1u7FbL-0001a4-TT; Tue, 22 Apr 2025 11:31:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=mwHGmD/mYqHEPW5rIRiHRUsNoZV9zkmxXl9yeRjTn4U=; b=jG69989w8Nc36mdmDNUl XmG/rmfLBFzUYN1LO3jgUhDgwr0xQnwiX9CiO4SOzuXfKOc69jWBnIQkw1bJOA27ziPn7SvtUnJrj gECdwJooTnM/ukGNkgJhSzi0N/n16kjmP5oy2PKxIKaLldAQCfgX/1xAvyi21eJWH9sF/bugKiOmz je7+axfNxedtAxzKCxjJ9uflLtz2SaTuDghu7pvN8BOcyoHZh2m+YL1+GgpnhmtchPW1EIgLtFMuH PoiawsFy+uWkPtZaOJ35hTOA4N/hosqUi88ysPMnB8oEmFhFJzIJkh2A2bASHEhR5pYA7t4WOzjM+ Wr8Dj7VatDztVg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 22 Apr 2025 17:31:47 +0200 Message-ID: <96bbf47ff95242e5bb2658c91e3adba5c330d845.1745335552.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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 These aliases were added in commit d4709d78c3b460d7be02f15f6cc6c85f398b1a46, Feb. 2022. * gnu/packages/maths.scm (scotch-shared, pt-scotch-shared): Remove. Change-Id: I971bbf999a9fce5dae05c865316defe55eaeb212 --- gnu/packages/maths.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b0c5b8685c..2c53f6d8af 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5290,17 +5290,6 @@ (define-public pt-scotch32 (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) -(define-public scotch-shared - ;; There used to be separate shared library variants while the default would - ;; provide .a files including PIC objects. With the switch to CMake, .a - ;; files contain non-PIC objects, which breaks some users, and switching to - ;; shared libraries by default seems to make more sense, as discussed here: - ;; . - (deprecated-package "scotch-shared" scotch)) - -(define-public pt-scotch-shared - (deprecated-package "pt-scotch-shared" pt-scotch)) - (define-public gklib (let ((commit "8bd6bad750b2b0d90800c632cf18e8ee93ad72d7") (revision "1")) From patchwork Tue Apr 22 15:31:48 2025 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: 41941 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 14E3927BC4B; Tue, 22 Apr 2025 16:34:22 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 5AD6327BC49 for ; Tue, 22 Apr 2025 16:34:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7FdF-0005Fw-VH; Tue, 22 Apr 2025 11:33:58 -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 1u7FcO-00051x-EV for guix-patches@gnu.org; Tue, 22 Apr 2025 11:33:11 -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 1u7FcO-0001gw-5X for guix-patches@gnu.org; Tue, 22 Apr 2025 11:33:04 -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=YWNHFoA5a4L+xd0H65srd4uGnLD84UBW4JjiLsLGJc0=; b=M1l/4cudwe39C9TRsoSoXulHBVmC5atF5yG1Qcrg707fVj6NpRFje7r5Do+VeSzA+u12di3I5pk0nGABTHDD1gF398s1Xgp5RZdaxOtIO4Hr0Ob+kQim0Ho9nlYgc5akQIHlxp40pjQD6jCKEHVUfOP5em/cBLyLYVZQdqKV05A6aRfbDDugu54pXSj0DUFUGAtpU5OEiIEB1Ccim8Qj6lnb5iOXo+VcdvciEFNfGA4HCdq4grPi2FQYlIcwNSrY4xc4etmRelSlvv/lcncWKaYeuG5ijOe1BGAuk0t5T4rXSHtkuk6qL9XtkdKAsym7MdJD/aXNtKUNjUUg/xMOvg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7FcN-0001KT-9Q; Tue, 22 Apr 2025 11:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77991] [PATCH 2/4] gnu: scotch: Keep *.cmake in the main output. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 22 Apr 2025 15:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77991 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77991@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 77991-submit@debbugs.gnu.org id=B77991.17453359324978 (code B ref 77991); Tue, 22 Apr 2025 15:33:03 +0000 Received: (at 77991) by debbugs.gnu.org; 22 Apr 2025 15:32:12 +0000 Received: from localhost ([127.0.0.1]:49453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FbX-0001ID-4u for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40276) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FbS-0001H4-7a for 77991@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:07 -0400 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 1u7FbM-0001aK-Rq; Tue, 22 Apr 2025 11:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=YWNHFoA5a4L+xd0H65srd4uGnLD84UBW4JjiLsLGJc0=; b=dcWJuWNfwisFAEI2N/hg y9mVfLc/tx6uXlV5XkPfAzFGVn6+oo0zMF3USjjze3oz89GIv86zerWkS24VsncjCO8QwMewYvXfi pKqAJdarMS2UF8KYB+cZ3O6i2dWsmuE7Kz0v8OxBsi7yVYCk0ZwTllfAAtSlzsf+mfCFVATxULeoh kEvwEC/ubATUCC3lFlw1D706rTNigwhVjWHLVJb18ZM0MrhVPECukxgOzO+ri5Zay/ZMCg2Pj2Cqg AUgyprM1m5RrWZT0ENRrA5JdLb5jLylPD9MAVk19TPN4rd/VqT4iU5Wg782Du4KxJc5KdkoXofYIP 8vrkY+Vo6YISgg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 22 Apr 2025 17:31:48 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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 This fixes a bug whereby ‘SCOTCHConfig.cmake’ would fail to find ‘scotchmetisTargets.cmake’ because it expects it to be in the same directory as itself, ${CMAKE_CURRENT_LIST_DIR}. * gnu/packages/maths.scm (scotch)[arguments]: Adjust ‘install-metis’ phase to keep *.cmake in “out”. Change-Id: If8d8f890852c35cede6e81c33d18b9101988a635 --- gnu/packages/maths.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2c53f6d8af..6a11103e3b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5220,15 +5220,22 @@ (define-public scotch (modify-phases %standard-phases (add-after 'install 'install-metis (lambda* (#:key outputs #:allow-other-keys) + ;; Move the METIS compatibility library to a separate output to + ;; avoid a name clash on . (let* ((out (assoc-ref outputs "out")) (metis (assoc-ref outputs "metis")) (prefix (string-length out))) (for-each (lambda (file) - (let ((target (string-append - metis - (string-drop file prefix)))) - (mkdir-p (dirname target)) - (rename-file file target))) + ;; 'SCOTCHConfig.cmake' includes + ;; *metisTargets.cmake from + ;; ${CMAKE_CURRENT_LIST_DIR} so keep all *.cmake + ;; files in "out". + (unless (string-suffix? ".cmake" file) + (let ((target (string-append + metis + (string-drop file prefix)))) + (mkdir-p (dirname target)) + (rename-file file target)))) (find-files out "metis")))))))) (home-page "https://www.labri.fr/perso/pelegrin/scotch/") (properties From patchwork Tue Apr 22 15:31:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 41942 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 F1B2427BC49; Tue, 22 Apr 2025 16:34:32 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 5A8FE27BC49 for ; Tue, 22 Apr 2025 16:34:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7FdE-0005DG-Ml; Tue, 22 Apr 2025 11:33:56 -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 1u7FcR-00052E-Fr for guix-patches@gnu.org; Tue, 22 Apr 2025 11:33:21 -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 1u7FcQ-0001h5-LS for guix-patches@gnu.org; Tue, 22 Apr 2025 11:33:06 -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=9pnm5sIfUI9enmQ4+Ks6NwpKJlBi2sbi0IYnvzjBcww=; b=eu+DryklA427IRyLa657IaQkZ+SUXM0H2wL3bSAgOqrxmrLaHBkEb9LEefEcz2618ecLojPalGpZi7qE6CSvlNyil3evtYbhePraSSCVdTj3+3tMcAw3j7rtxvarj2v70VlPCKX6RRfGqJQk2OYf1ooYr8NBTLudZfBTMOCDQmwjY1Ey16uR8m+Y06By00q+dezAu2IiVzK5PlUsS79f2dD/m1FiCm1angkWO57+TnTca3xiS04LRbT6cGxb5AwJ1Qf9OhEAFEUmp+fk3ia2I5+ZiT8dK6NXgcqzQFObXltGHSUJLE5vEqd+8NRnA5GhZW827Qg8Do0uqMiIZ3qhig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7FcN-0001Kc-Tw; Tue, 22 Apr 2025 11:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77991] [PATCH 3/4] gnu: scotch, scotch32, pt-scotch, pt-scotch32: Use gexps. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 22 Apr 2025 15:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77991 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77991@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 77991-submit@debbugs.gnu.org id=B77991.17453359324986 (code B ref 77991); Tue, 22 Apr 2025 15:33:03 +0000 Received: (at 77991) by debbugs.gnu.org; 22 Apr 2025 15:32:12 +0000 Received: from localhost ([127.0.0.1]:49455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FbX-0001IF-UU for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40286) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FbT-0001HG-Ip for 77991@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:08 -0400 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 1u7FbN-0001aW-Uh; Tue, 22 Apr 2025 11:32:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=9pnm5sIfUI9enmQ4+Ks6NwpKJlBi2sbi0IYnvzjBcww=; b=ckYGDLBxBwZrPew6gqo+ jym0Zc4m1tfGaDjUZirqUERUoyq6orhZkdO7lA8emZlsXrQHLPryYdxjkPEdxgMxWFaQeoew23h1A ooJ8tQcT5KmpUAt/t3jnzosMY7TkxP0WsNkuy5xpiNrn3BdOHl850Y2lZPqSDWJBL0ExrEkcgnG05 455S5+3HJge1qrpBAhc23jn2YHs5nShiRx1qC2T1TkkifvQQHI5XwAWxTijryByBStD/HqdBeJZ8T f2/NT62qPPAFYC3/DFzobUpvLVhUwFG91tyrmBtRhqWtqR2Kb/sbsSy2txUweNPfraTpoJk0tLZpg +svg2dmroJjxDQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 22 Apr 2025 17:31:49 +0200 Message-ID: <8907d0e03e2bf27d5398517a1ff31acfdb9ff0cb.1745335552.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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 (scotch, scotch32) (pt-scotch, pt-scotch32): Use gexps. Change-Id: I93febc994c5345e133eddbd016b1974d08df5bdf --- gnu/packages/maths.scm | 70 ++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6a11103e3b..abd05b9d63 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5214,29 +5214,30 @@ (define-public scotch (list flex bison gfortran)) (outputs '("out" "metis")) (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64" - "-DBUILD_PTSCOTCH=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-metis - (lambda* (#:key outputs #:allow-other-keys) - ;; Move the METIS compatibility library to a separate output to - ;; avoid a name clash on . - (let* ((out (assoc-ref outputs "out")) - (metis (assoc-ref outputs "metis")) - (prefix (string-length out))) - (for-each (lambda (file) - ;; 'SCOTCHConfig.cmake' includes - ;; *metisTargets.cmake from - ;; ${CMAKE_CURRENT_LIST_DIR} so keep all *.cmake - ;; files in "out". - (unless (string-suffix? ".cmake" file) - (let ((target (string-append - metis - (string-drop file prefix)))) - (mkdir-p (dirname target)) - (rename-file file target)))) - (find-files out "metis")))))))) + (list #:configure-flags #~'("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64" + "-DBUILD_PTSCOTCH=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-metis + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the METIS compatibility library to a separate output to + ;; avoid a name clash on . + (let* ((out (assoc-ref outputs "out")) + (metis (assoc-ref outputs "metis")) + (prefix (string-length out))) + (for-each (lambda (file) + ;; 'SCOTCHConfig.cmake' includes + ;; *metisTargets.cmake from + ;; ${CMAKE_CURRENT_LIST_DIR} so keep all + ;; *.cmake files in "out". + (unless (string-suffix? ".cmake" file) + (let ((target + (string-append metis + (string-drop file + prefix)))) + (mkdir-p (dirname target)) + (rename-file file target)))) + (find-files out "metis")))))))) (home-page "https://www.labri.fr/perso/pelegrin/scotch/") (properties `((release-monitoring-url @@ -5260,9 +5261,8 @@ (define-public scotch32 (name "scotch32") (arguments (substitute-keyword-arguments (package-arguments scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF" - "-DINTSIZE=32")))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF" "-DINTSIZE=32")))) (synopsis "Programs and libraries for graph algorithms (32-bit integers)"))) @@ -5274,13 +5274,12 @@ (define-public pt-scotch (list openmpi)) ;headers include MPI headers (arguments (substitute-keyword-arguments (package-arguments scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" - "-DINTSIZE=64")) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'check 'mpi-setup - ,%openmpi-setup))))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" "-DINTSIZE=64")) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'check 'mpi-setup + #$%openmpi-setup))))) (synopsis "Programs and libraries for graph algorithms (with MPI)"))) (define-public pt-scotch32 @@ -5291,9 +5290,8 @@ (define-public pt-scotch32 (list openmpi)) ;headers include MPI headers (arguments (substitute-keyword-arguments (package-arguments pt-scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" - "-DINTSIZE=32")))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" "-DINTSIZE=32")))) (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) From patchwork Tue Apr 22 15:31:50 2025 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: 41943 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 5922127BC49; Tue, 22 Apr 2025 16:34:33 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 C2AAF27BC4B for ; Tue, 22 Apr 2025 16:34:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7FdT-0005Hl-Jz; Tue, 22 Apr 2025 11:34:12 -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 1u7FcR-00052G-Go for guix-patches@gnu.org; Tue, 22 Apr 2025 11:33:21 -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 1u7FcQ-0001h6-Uk for guix-patches@gnu.org; Tue, 22 Apr 2025 11:33:07 -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=w2h4I7m/OPv2DyE/wT+PZw0KlU6m89O31HC2VJIYk+Q=; b=gHPdpdkgud5PIv/F0y47Fd8I+Zvz0mJ7maCPws5G35I8EWR8PSxu5INCgwq/oZs/F5QYL0RXhItOuv3KqcOhe7BU5HMqKNzcMsD1ahkDzkfWBIr+J+Vorpg28x+0GmBYwUerCjscephhuYQC7ol+tlL8T1J9Il6AAuvvytV5wTzqIWTAAwCwcc6d6unkpbdeoevAvTaCgA9x0ajhejWAJr5l0+9oi8/oYEbsiNtjlY6qYLEVhqYh3qFFs/r++sHTTbB3QCiCEwZPW1ggMNn7tcZ+8J124JMMnGsNNcpkSbkwVO9u9TdsiOb2YFKoWRnhrZaaL84ItskNQtSULvnI3Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7FcO-0001Ko-Fk; Tue, 22 Apr 2025 11:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77991] [PATCH 4/4] gnu: scotch: Update to 7.0.7. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 22 Apr 2025 15:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77991 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77991@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 77991-submit@debbugs.gnu.org id=B77991.17453359334992 (code B ref 77991); Tue, 22 Apr 2025 15:33:04 +0000 Received: (at 77991) by debbugs.gnu.org; 22 Apr 2025 15:32:13 +0000 Received: from localhost ([127.0.0.1]:49457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FbY-0001IP-Hl for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40302) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FbU-0001Ha-Md for 77991@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:08 -0400 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 1u7FbO-0001af-TK; Tue, 22 Apr 2025 11:32:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=w2h4I7m/OPv2DyE/wT+PZw0KlU6m89O31HC2VJIYk+Q=; b=J7LixhRHMXlz04mrKdCW SypL9bH/x1cObNFCxh6hcx0gyJIb7u6fM7zTkES3DKx3QeHvcLbABpGpZB4TvcQ5+OiJ7ftzLzX3A dEG8we4uWpTUqELTK/rOXj+XEqujN0eTPfz39n3MuGVHe4njvTXqDoWJlnjj5o0TJbUpYVy9d53Hs lZIe5vMfMPp0dehZJbp8ZckBgDtNoqiE2ZS7rmt2YBueM8yVJdoYDLbDhIjVAxQ/yctAJSB0kdY8X uFG3PGglSQnN7GcnoYDC3JfRvDli2oH8tri1SXzwnoXiWJ9uFNX5QsjtOHI7TVlVFYmOlLDqMF3lD sW3qQyd0pxkEFQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 22 Apr 2025 17:31:50 +0200 Message-ID: <636528fd7d7d8c0195c3037a1e582eb690d57b9e.1745335552.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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/maths.scm (scotch): Update to 7.0.7. Change-Id: Idef8e0956d9da1aef13fb423c53db60b6a61b04b --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index abd05b9d63..5683c24f84 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5190,7 +5190,7 @@ (define-public superlu-dist (define-public scotch (package (name "scotch") - (version "7.0.4") + (version "7.0.7") (source (origin (method git-fetch) @@ -5199,7 +5199,7 @@ (define-public scotch (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rbc51albpd2923dkirpkj8rfkic6rsvwqqnv1mmsk391zhk3amr")) + (base32 "0r46bmnz9xjlgcb3vvlx3sg2qh4gfgga89vs4vlbzz3s4lj48g46")) (modules '((guix build utils))) (snippet #~(substitute* "src/libscotchmetis/library_parmetis.h"