From patchwork Thu Apr 24 14:36:56 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: 41980 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 78CDF27BC49; Thu, 24 Apr 2025 15:38:35 +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 5381E27BC4A for ; Thu, 24 Apr 2025 15:38:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7xiJ-0001lX-AK; Thu, 24 Apr 2025 10:38:07 -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 1u7xiH-0001lF-Pv for guix-patches@gnu.org; Thu, 24 Apr 2025 10:38:05 -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 1u7xiH-0003nj-Ge for guix-patches@gnu.org; Thu, 24 Apr 2025 10:38:05 -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=a0p9nZZmOMSztECXb0/iVSxX2W/t941RFDIRcGfP2wQ=; b=ZEsmeMlOeZ8PohhzAUY+wjrzqUQJuh19cz+krlStguXXvc4z+5M34IF4s/pHK9FKhuUrjxEdRX0FYrwhBfxzmlzkq0ey7wrFYVuAXlMZzbE5Te3oyOQzpue0rJdi1hlkvHZoVTmjjzqyPBJU2ZCPYuFLE5L+lSf3xsRREdeStStmzNk+DnhM5dO0yzY0oNezhVnLEIJyRU/9Gtp4gW0fAHP6VwQ31EgCOylUmV3I+v8f0xUhLzzR7l8plhlT+0lv8DPmhXR2in/2aN4gznKQcqRFTtXxEgva+6sHFIkiOsPlzbKYVU27W0Yk29ryaqMhyyWipbaywunszPaq+kTbuw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7xiG-0002RC-Re; Thu, 24 Apr 2025 10:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77991] [PATCH v2 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: Thu, 24 Apr 2025 14:38: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.17455054609267 (code B ref 77991); Thu, 24 Apr 2025 14:38:04 +0000 Received: (at 77991) by debbugs.gnu.org; 24 Apr 2025 14:37:40 +0000 Received: from localhost ([127.0.0.1]:39924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhs-0002PM-4R for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39776) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhl-0002Nx-Pb for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:35 -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 1u7xhg-0003ln-DS; Thu, 24 Apr 2025 10:37:28 -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=a0p9nZZmOMSztECXb0/iVSxX2W/t941RFDIRcGfP2wQ=; b=P41ypoBG592Z3D7dyYsX 5cSfOYWYePwimRF6pBzmoEevBuYCqzpVrEMSMr08S2jARID49TgOOEXExag+fk7wPgzCucLDpDB1o j6IBJBCrVxIUZ+skELBa5ORAUTU2c3VaXcMWDbvZi2H84LVkv7h7mgGs6NbLwnhukmazR+RbbeoPL YS/lJK4znn0Qu/8t2tYqR5HmUFwvW4tTWpw+/lNpe5TM4/iOX64ZeYII8bGGoKuea8KILQbIQG4lm amHwTe8aUaEQRNFwBk6sVFqiE27JxKsbJNHe+Aj/Iegd7xpt4CB9rK1Oy7fbThWzBxYs/xKvKtgCl YY5bLopup0suOw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 24 Apr 2025 16:36:56 +0200 Message-ID: <8183442a110262953babb735450d10e630d87a24.1745505295.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 | 60 ++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 33eb4cda7b..47dc63bcec 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5215,24 +5215,25 @@ (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) - (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) + (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 @@ -5256,9 +5257,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)"))) @@ -5270,13 +5270,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 @@ -5287,9 +5286,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)")))