From patchwork Thu Oct 19 22:31:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 55065 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 800EE27BBEA; Thu, 19 Oct 2023 23:32:55 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 890AE27BBE2 for ; Thu, 19 Oct 2023 23:32:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtbZH-0005TY-E4; Thu, 19 Oct 2023 18:32:39 -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 1qtbZF-0005TG-2f for guix-patches@gnu.org; Thu, 19 Oct 2023 18:32:37 -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 1qtbZE-0002f3-Nw for guix-patches@gnu.org; Thu, 19 Oct 2023 18:32:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtbZe-0007GR-D9 for guix-patches@gnu.org; Thu, 19 Oct 2023 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH] gnu: Propagate suitesparse-* inputs referenced in header files. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Oct 2023 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169775472227836 (code B ref 66129); Thu, 19 Oct 2023 22:33:02 +0000 Received: (at 66129) by debbugs.gnu.org; 19 Oct 2023 22:32:02 +0000 Received: from localhost ([127.0.0.1]:38049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtbYf-0007En-Bp for submit@debbugs.gnu.org; Thu, 19 Oct 2023 18:32:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtbYc-0007Di-G9 for 66129@debbugs.gnu.org; Thu, 19 Oct 2023 18:32:00 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0AC4F240101 for <66129@debbugs.gnu.org>; Fri, 20 Oct 2023 00:31:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1697754686; bh=LyB/JB/6Xi9hu7uP/6pPHBi+MxGfeNZPwv3//eOLVoA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=owrJi+Y1eBiMiYdl/lgV3oJH6rrEYDiYjqlIuOKEeDV5db5uQzrgDX4JRP7c3HrMM 3yX6OA7RqfGzDvN67jtKfBIqTlZWKUcioQ1++H5+I/P6xXaNDsj8UlW3SC7tq/yMyj K/DtSlGLYoO5Of7MfhsYLPD9EvtNP+DN0qS2XVmUFHjPyLAyA/gmuUWawoidAJXA2u m+DY/5Jhn3nNbZvlfLfXAst4Qx4WsePCkHDYL66A98HlkyFjJNyx2QAqJe0NZu7bqm 3ydOYGYAU32KiE9RGSuwJ1ac2ZGLTGLx3lGh7nCjkcs2m7gBa/Gln/InIrOIS4xq0R 6Q3ua7Em+nQ3A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SBMrY4fQVz6tx9; Fri, 20 Oct 2023 00:31:25 +0200 (CEST) From: David Elsing Date: Thu, 19 Oct 2023 22:31:17 +0000 Message-ID: <20231019223117.30879-1-david.elsing@posteo.net> In-Reply-To: <868r7ygs9l.fsf@posteo.net> References: <868r7ygs9l.fsf@posteo.net> 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 (suitesparse-amd, suitesparse-btf, suitesparse-camd, suitesparse-colamd, suitesparse-ccolamd, gklib-suitesparse, suitesparse-cholmod, suitesparse-cxsparse, suitesparse-klu, suitesparse-ldl, suitesparse-rbio, suitesparse-mongoose, suitesparse-spex, suitesparse-spqr, suitesparse-umfpack)[inputs]: Move relevant suitesparse-* packages ... [propagated-inputs]: ... to here. --- gnu/packages/maths.scm | 75 +++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 683acd96e1..8fba8beaa8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5283,7 +5283,7 @@ (define-public suitesparse-amd (install-file "../AMD/Doc/License.txt" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs (list suitesparse-config)) + (propagated-inputs (list suitesparse-config)) (native-inputs (list gfortran (texlive-updmap.cfg '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Sparse matrix ordering for Cholesky factorization") @@ -5317,7 +5317,7 @@ (define-public suitesparse-btf (install-file "../BTF/Doc/License.txt" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs (list suitesparse-config)) + (propagated-inputs (list suitesparse-config)) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Library for permuting matrices into block upper triangular form") (description "BTF (Block Triangular Form) is a C library for permuting a @@ -5359,7 +5359,7 @@ (define-public suitesparse-camd (install-file "../CAMD/Doc/License.txt" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs (list suitesparse-config)) + (propagated-inputs (list suitesparse-config)) (native-inputs (list (texlive-updmap.cfg '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Sparse matrix ordering for Cholesky factorization with constraints") @@ -5395,7 +5395,7 @@ (define-public suitesparse-colamd (install-file "../COLAMD/Doc/License.txt" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs (list suitesparse-config)) + (propagated-inputs (list suitesparse-config)) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Column Approximate Minimum Degree Ordering") (description "COLAMD is library for computing a permutation vector for a @@ -5428,7 +5428,7 @@ (define-public suitesparse-ccolamd (install-file "../CCOLAMD/Doc/License.txt" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs (list suitesparse-config)) + (propagated-inputs (list suitesparse-config)) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Column Approximate Minimum Degree Ordering with constraints") (description "CCOLAMD is library for computing a permutation vector for a @@ -5457,9 +5457,7 @@ (define-public gklib-suitesparse all "target_link_libraries(GKlib PUBLIC" " ${SUITESPARSE_CONFIG_LIBRARIES} m)\n"))))))))) - (inputs - (modify-inputs (package-inputs gklib) - (prepend suitesparse-config))))) + (propagated-inputs (list suitesparse-config)))) (define-public metis-suitesparse (package/inherit metis-5.2 @@ -5561,8 +5559,8 @@ (define-public suitesparse-cholmod suitesparse-amd suitesparse-camd suitesparse-ccolamd - suitesparse-colamd - suitesparse-config)) + suitesparse-colamd)) + (propagated-inputs (list suitesparse-config)) (native-inputs (list (texlive-updmap.cfg '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Library for solving sparse symmetric positive definite linear @@ -5599,7 +5597,7 @@ (define-public suitesparse-cxsparse "/share/doc/" #$name "-" #$version))) (install-file "../CXSparse/Doc/License.txt" out) (install-file "../CXSparse/Doc/lesser.txt" out))))))) - (inputs (list suitesparse-config)) + (propagated-inputs (list suitesparse-config)) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Concise eXtended Sparse Matrix Package") (description "CXSparse is a collection of sparse matrix algorithms for @@ -5655,13 +5653,14 @@ (define-public suitesparse-klu (string-append #$output "/share/doc/" #$name "-" #$version))))))) (inputs - (list suitesparse-amd - suitesparse-btf - suitesparse-camd + (list suitesparse-camd suitesparse-ccolamd - suitesparse-cholmod suitesparse-colamd suitesparse-config)) + (propagated-inputs + (list suitesparse-amd + suitesparse-btf + suitesparse-cholmod)) (native-inputs (list (texlive-updmap.cfg '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Routines for solving sparse linear problems with a LU factorization") @@ -5712,9 +5711,8 @@ (define-public suitesparse-ldl (install-file "../LDL/Doc/License.txt" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs - (list suitesparse-amd - suitesparse-config)) + (inputs (list suitesparse-amd)) + (propagated-inputs (list suitesparse-config)) (native-inputs (list (texlive-updmap.cfg '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "LDL' factorization method for sparse, symmetric matrices") @@ -5754,7 +5752,7 @@ (define-public suitesparse-rbio "/share/doc/" #$name "-" #$version))) (install-file "../RBio/Doc/License.txt" out) (install-file "../RBio/Doc/gpl.txt" out))))))) - (inputs (list suitesparse-config)) + (propagated-inputs (list suitesparse-config)) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Library for the Rutherford/Boeing sparse matrix format") (description "This package provides the C library of RBio. It can be used @@ -5803,7 +5801,7 @@ (define-public suitesparse-mongoose (install-file "../Mongoose/Doc/License.txt" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs (list suitesparse-config)) + (propagated-inputs (list suitesparse-config)) (native-inputs (list texlive-epstopdf (texlive-updmap.cfg @@ -5872,12 +5870,8 @@ (define-public suitesparse-spex (install-file "../SPEX/Doc/SPEX_UserGuide.pdf" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs - (list gmp - mpfr - suitesparse-amd - suitesparse-colamd - suitesparse-config)) + (inputs (list suitesparse-amd suitesparse-colamd)) + (propagated-inputs (list gmp mpfr suitesparse-config)) (native-inputs (list (texlive-updmap.cfg (list texlive-paralist @@ -5950,14 +5944,13 @@ (define-public suitesparse-spqr (install-file "../SPQR/Doc/License.txt" (string-append #$output "/share/doc/" #$name "-" #$version))))))) - (inputs - (list openblas - suitesparse-amd - suitesparse-camd - suitesparse-ccolamd - suitesparse-cholmod - suitesparse-colamd - suitesparse-config)) + (inputs (list openblas + suitesparse-amd + suitesparse-camd + suitesparse-ccolamd + suitesparse-colamd + suitesparse-config)) + (propagated-inputs (list suitesparse-cholmod)) (native-inputs (list (texlive-updmap.cfg (list texlive-epsf)))) @@ -6016,13 +6009,13 @@ (define-public suitesparse-umfpack #$name "-" #$version))) (install-file "../UMFPACK/Doc/License.txt" outdir) (install-file "../UMFPACK/Doc/gpl.txt" outdir))))))) - (inputs - (list openblas - suitesparse-amd - suitesparse-camd - suitesparse-ccolamd - suitesparse-cholmod - suitesparse-colamd + (inputs (list openblas + suitesparse-camd + suitesparse-ccolamd + suitesparse-cholmod + suitesparse-colamd)) + (propagated-inputs + (list suitesparse-amd suitesparse-config)) (native-inputs (list (texlive-updmap.cfg