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