From patchwork Thu Apr 24 14:36:54 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: 41979 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 0BB1127BC4B; Thu, 24 Apr 2025 15:38:34 +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 C019927BC4A for ; Thu, 24 Apr 2025 15:38:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7xiI-0001lT-Ph; Thu, 24 Apr 2025 10:38:06 -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-0001kh-9j 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 1u7xiG-0003nd-PU for guix-patches@gnu.org; Thu, 24 Apr 2025 10:38: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=J4BUc2u9ZnTtAAs7EpoxMxglc3zHFSPSwDFI6015gL8=; b=J+5DeX0g6W+aKHYteaXnoJQyX3xC2NAlE1S6gpvnRRLDGDKPgHp4gPLMS2ek4bO5zcphwSXRYabvTsAPa1MmW6Anqt5otXAtAjWcXAfVX6F7/4dpn1G82sdjz0eJ9l+oOodgfCO08XzcTAoBDzNXXZ2133pXBgUwNOdMSWURtq76gecaLENeXMs3QE4Vdkcq416OxfQVck9cj+zgHWR07iuH2Iqkv4rcwA6GVp+R4JJPQXJ021xUjOWdgtXtjlF4halxrIS2CD2r+/kjX+Dosv7jvBQ74XpqjbdfTSVfXSKBojk7AaRcBzHL3jIYcJodVofrIxp1X5e34dDr1Q+Wuw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7xiF-0002Qu-Qo; Thu, 24 Apr 2025 10:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77991] [PATCH v2 1/4] gnu: scotch: Remove =?utf-8?b?4oCcLXNo?= =?utf-8?b?YXJlZOKAnQ==?= 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: Thu, 24 Apr 2025 14:38: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.17455054599252 (code B ref 77991); Thu, 24 Apr 2025 14:38:03 +0000 Received: (at 77991) by debbugs.gnu.org; 24 Apr 2025 14:37:39 +0000 Received: from localhost ([127.0.0.1]:39920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhq-0002P6-Ok for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39762) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhj-0002Nr-Nj for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:32 -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 1u7xhe-0003lN-B0; Thu, 24 Apr 2025 10:37:26 -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=J4BUc2u9ZnTtAAs7EpoxMxglc3zHFSPSwDFI6015gL8=; b=nirDeYjRuCHEmH9mS+3f wroFk4lWh6uNveT3u+p6JwKz0mQ+WYLlVp91MXnGbCasGUpsf1EcClg6SnLnrWoj/u/FF1GzB9xeo Z8sQy5GoiY8MR5foqfD91wT9MQ21qYYQk94vN6obxzW9WWdmLzuWWMHEzE8CPWvJxZ/668pGGRERt HGKFeQOrnmex4zILWOgb0c3ewKABum6Y+jACpuHBJ1n58T3krQDD107MdwFjHs6F+Ix59SAsFexqn bRZQfrwyDoRAXmUETd3a0LQ/9fgV+Yqxd/aYNLWaHkenbkcskI5WTm1qiZypWv9KY2iS+JPW+WA66 RMyZdVpvo2CjkA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 24 Apr 2025 16:36:54 +0200 Message-ID: <30c81ad6f2f6d2d74633651bbc0799630ac88bb3.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 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 28c71283a7..7327aeaf40 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 Thu Apr 24 14:36:55 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: 41981 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 EEB7D27BC4B; Thu, 24 Apr 2025 15:38:40 +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 53A2227BC49 for ; Thu, 24 Apr 2025 15:38:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7xiM-0001nI-EK; Thu, 24 Apr 2025 10:38:10 -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 1u7xiK-0001m1-3J for guix-patches@gnu.org; Thu, 24 Apr 2025 10:38:08 -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 1u7xiJ-0003nx-Py for guix-patches@gnu.org; Thu, 24 Apr 2025 10:38: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=kNwHryhMlSwIA7FMGoi3+HJ9kFnu/HZgR3/xE0Xev1g=; b=kecmuzCYdsrRCgqOrZgUfl354bbdpV+YILhCF4qfBaxdTFNJ2FMMRFr6aBURwTKEy5cdsOle0xI6w8n4CPt/oWJ42f8jR54BP7OsIfNDCJu0kWOyQKGVyVWtgPsFgImbOtuqmx6SYtiQ+NFFN28UYa27u8//y5nx2twIut9IrEL8Ng+QHWteT1um05prgBTcu8wNFUtBpHO+4izctBe8lFYgy3ZErC3YHq6t/5QkxultFP5IpL4LXeRGdcTTFF5UeXAYMgU7++ZNEnOeLQNjFxKUm4gjNI9yNbv2IXMsRfLBu4Az6yubS5Tzkq43b4YVImf7Ryoz7lKNdRj/+y1UxQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7xiG-0002R1-C2; Thu, 24 Apr 2025 10:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77991] [PATCH v2 2/4] gnu: scotch: Remove CMake machinery for the Metis compatibility layer. 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.17455054609258 (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]:39922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhr-0002PD-Dg for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39764) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhl-0002Nv-0m for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:34 -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 1u7xhf-0003ld-Ew; Thu, 24 Apr 2025 10:37:27 -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=kNwHryhMlSwIA7FMGoi3+HJ9kFnu/HZgR3/xE0Xev1g=; b=JK5rUZfBP3DRlaf8QE5Y MpBRQElnufARSHQSQHUdoXCRMKWgjqpU1R3fLlyc8QFiQErZ4oLXWQapvAQcFhs83aWop/qEebXPb sINDjsvY84TLkIyQmZY+c1qvr8ZOQon+5wLbqcFym4X2K1++Plb6UaL9xnxN+77p+1HVE9tULIEEx yslvW2NhxBInAYWUDxf2bKdghDyTaaniFbg/KpqjgYf0/wBFe3Mrmt7M745E0OZsT5EsSXQdFt+Y2 YGCkFQZB0+TO0ClKMfBnukO/XjHJovnRTuOz06WUKg3MpWWFcfv9mLxWMruShKk4hhV2X9UGZ/vKe pDync2gNofxpuQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 24 Apr 2025 16:36:55 +0200 Message-ID: <316ce8695c3b7b06fee2e483218b434ad8511b50.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 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/patches/scotch-cmake-remove-metis.patch: New file. * gnu/packages/maths.scm (scotch)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: If8d8f890852c35cede6e81c33d18b9101988a635 --- gnu/local.mk | 1 + gnu/packages/maths.scm | 3 +++ .../patches/scotch-cmake-remove-metis.patch | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/scotch-cmake-remove-metis.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4aa84f8ef9..a250b3f748 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2249,6 +2249,7 @@ dist_patch_DATA = \ %D%/packages/patches/scilab-better-compiler-detection.patch \ %D%/packages/patches/scilab-tbx_build_help.patch \ %D%/packages/patches/scons-test-environment.patch \ + %D%/packages/patches/scotch-cmake-remove-metis.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/scsh-nonstring-search-path.patch \ %D%/packages/patches/seed-webkit.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7327aeaf40..33eb4cda7b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5200,6 +5200,7 @@ (define-public scotch (file-name (git-file-name name version)) (sha256 (base32 "0rbc51albpd2923dkirpkj8rfkic6rsvwqqnv1mmsk391zhk3amr")) + (patches (search-patches "scotch-cmake-remove-metis.patch")) (modules '((guix build utils))) (snippet #~(substitute* "src/libscotchmetis/library_parmetis.h" @@ -5220,6 +5221,8 @@ (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))) diff --git a/gnu/packages/patches/scotch-cmake-remove-metis.patch b/gnu/packages/patches/scotch-cmake-remove-metis.patch new file mode 100644 index 0000000000..91bb36f86e --- /dev/null +++ b/gnu/packages/patches/scotch-cmake-remove-metis.patch @@ -0,0 +1,24 @@ +Remove the CMake machinery for the Metis/Parmetis compatibility layer: +it has zero users and complicates things due to the separate "metis" +output. + +Notably, the assumption in 'SCOTCHConfig.cmake' is that *metisTargets.cmake +are in the same directory, which is not the case here. Furthermore, +'*metisTargets-relwithdebuginfo.cmake' assumes 'libscotchmetis*.so*' is +available under '_IMPORT_PREFIX', which is only the case when +'libscotchmetis*.so' is installed in the same directory as 'libscotch.so'. + +diff --git a/cmake/SCOTCHConfig.cmake.in b/cmake/SCOTCHConfig.cmake.in +index ec52ac5..4ce5c30 100644 +--- a/cmake/SCOTCHConfig.cmake.in ++++ b/cmake/SCOTCHConfig.cmake.in +@@ -77,9 +77,3 @@ if(@BUILD_LIBESMUMPS@) + include("${CMAKE_CURRENT_LIST_DIR}/ptesmumpsTargets.cmake") + endif() + endif() +-if(@BUILD_LIBSCOTCHMETIS@) +- include("${CMAKE_CURRENT_LIST_DIR}/scotchmetisTargets.cmake") +- if(@BUILD_PTSCOTCH@) +- include("${CMAKE_CURRENT_LIST_DIR}/ptscotchparmetisTargets.cmake") +- endif() +-endif() 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)"))) From patchwork Thu Apr 24 14:36:57 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: 41978 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 7C10627BC4B; Thu, 24 Apr 2025 15:38:16 +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 7D83127BC49 for ; Thu, 24 Apr 2025 15:38:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7xiN-0001nU-Dj; Thu, 24 Apr 2025 10:38:11 -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 1u7xiL-0001mv-Px for guix-patches@gnu.org; Thu, 24 Apr 2025 10:38:09 -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 1u7xiL-0003o8-Fk for guix-patches@gnu.org; Thu, 24 Apr 2025 10:38:09 -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=2s2sgqw6fSsT+wuNZEwBYpCE4fma/rG/YfrnI/7v4l0=; b=P/8m0m2eB9ck55oUVesCke9H/u//0pcU2fsqeO28jF1AxAD3ZD9Z69Ro9mWmS4/wn9wbLmGylO5derBLGN7QlJY8yDMwKP1/jCwsNMRpe+lI2lQXiK+SA+a2l+C8KfV9lWbibohQDSeoIjyRFkq5hH8JG0ZdPU9AEq1vHdgh4Jjl88t/YidWNnTHUxPTp0RNKUpn9gSssLUml5wR0G2yanuHWi3ha/y4WXLANB+B7jTSj4W7GDA16ScqSjsNVCpdOUyjZ5hXvCYPybbdjO1wmxR7TbyJzEE/muT+5aAHaBJvaCtj6xKMNAlW9C+0ZVUwKaemRBeYsS+3nRmauV0XCg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7xiH-0002RN-Pn; Thu, 24 Apr 2025 10:38:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77991] [PATCH v2 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: Thu, 24 Apr 2025 14:38:05 +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.17455054619275 (code B ref 77991); Thu, 24 Apr 2025 14:38:05 +0000 Received: (at 77991) by debbugs.gnu.org; 24 Apr 2025 14:37:41 +0000 Received: from localhost ([127.0.0.1]:39926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhs-0002PV-MB for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39786) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhm-0002Nz-O0 for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:37 -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 1u7xhh-0003lu-Dl; Thu, 24 Apr 2025 10:37:29 -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=2s2sgqw6fSsT+wuNZEwBYpCE4fma/rG/YfrnI/7v4l0=; b=QgaNtI9SPnLwJtnudUoB BmMWBIhxkjyg9f12ksQ0BW7HeQJ7zLttSrbNIBTLvyOPpbMZYN1guqn/vgWReyd/LfvcN0ZEoYMlH HvIqAbn1hEUn3MP8QRpo5l7oqvKDOKS9tc9ZDqeZL9nXm6TEk9S0C9PCj/EAFRlzzeaOcE8PdSCbI wZl3m7Ax4UDPSI1QUBoEa0IgrOQX02GAfBMu5uVOrU6ylmMF7+e4sc6MF02XChR7QbDh7C9Z2+EAV e+dUt8JgV0VexF25jof7UguGM7N/uEl3ntuj+xxxUAnubmUzmiBWQ2U4bBi8zMSr3Z0mrU8lcADuu vZtBDcywDYoKjA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 24 Apr 2025 16:36:57 +0200 Message-ID: <18bdde5cdf6b3b82a4cd637dd422c0b72e532d93.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 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 47dc63bcec..ee6b64350c 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")) (patches (search-patches "scotch-cmake-remove-metis.patch")) (modules '((guix build utils))) (snippet