From patchwork Mon Sep 25 21:13:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54290 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 C4CD027BBEB; Mon, 25 Sep 2023 22:15: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 8A60827BBEA for ; Mon, 25 Sep 2023 22:15:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qksur-00087w-Al; Mon, 25 Sep 2023 17:14:53 -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 1qksuo-00087S-0Q for guix-patches@gnu.org; Mon, 25 Sep 2023 17:14:50 -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 1qksun-00041c-OM for guix-patches@gnu.org; Mon, 25 Sep 2023 17:14:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qksv0-0005un-Ad for guix-patches@gnu.org; Mon, 25 Sep 2023 17:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66201] [PATCH 2/2] gnu: Remove suitesparse-3. References: <20230925210126.8730-1-david.elsing@posteo.net> In-Reply-To: <20230925210126.8730-1-david.elsing@posteo.net> Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Sep 2023 21:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66201@debbugs.gnu.org Cc: David Elsing Received: via spool by 66201-submit@debbugs.gnu.org id=B66201.169567645022649 (code B ref 66201); Mon, 25 Sep 2023 21:15:02 +0000 Received: (at 66201) by debbugs.gnu.org; 25 Sep 2023 21:14:10 +0000 Received: from localhost ([127.0.0.1]:46785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksu9-0005tF-W4 for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:14:10 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksu1-0005sI-Dz for 66201@debbugs.gnu.org; Mon, 25 Sep 2023 17:14:05 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 35B87240101 for <66201@debbugs.gnu.org>; Mon, 25 Sep 2023 23:13:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695676423; bh=rUTYOt2jTqtd6LmLlYT/A3H2BTiar7mkdEJC8o61jb8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=L0hg90028OsDE/fZBLT6vxtDy3Quf8kZP1My+l00JW+BKXydXBS3z1spsuBlnngRi I7AjZHg4BhjGpvONxd16IyuuDkZC40433hntZsVz/pThqbidCSR3/+jkz5EVg/svJY zMlJFixQhHTto2xV3qJigE4wOOjkwWvGwbsOOS//LAGMeSIariSZ6mVn2KadfUwsyN taySEQrxhylQcRJIMQ4pXLwzkm5nYR7wKIpCYZvtdHt+PzTHShsWZV9g4uUJXtnNxa m3WN0OSQ1xQ4GtS3MqRTAd+Z64eEgW4aJl4nbEo7T6fpHPTzF7pLSjXT+k6MECv9eG tYz16gzw7bCxw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RvbFy5hmGz9ryV; Mon, 25 Sep 2023 23:13:42 +0200 (CEST) From: David Elsing Date: Mon, 25 Sep 2023 21:13:13 +0000 Message-ID: <20230925211319.9698-2-david.elsing@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-3): Delete variable. --- gnu/packages/maths.scm | 89 ------------------------------------------ 1 file changed, 89 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ff50a99599..b2446f23c9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4965,95 +4965,6 @@ (define-public suitesparse ;; GPUQREngine, RBio, SuiteSparse_GPURuntime, SuiteSparseQR, UMFPACK (license (list license:gpl2+ license:lgpl2.1+)))) - -;; This outdated version is used to build the scilab package. -(define-public suitesparse-3 - (package - (inherit suitesparse) - (name "suitesparse") - (version "3.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DrTimothyAldenDavis/SuiteSparse") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0wxk755nzps0c9la24zqknqkzjp6rcj5q9jhd973mff1pqja3clz")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ;no "check" target - #:make-flags - ,#~(list - (string-append "CC=gcc") - "AR=gcc -shared -o" - "RANLIB=touch" - "CFLAGS=-O3 -fPIC -I../Include" - "TBB=-ltbb" - - ;; Disable metis@4 (nonfree) support. - "CHOLMOD_CONFIG=-DNPARTITION" - "METIS=" - "METIS_PATH=" - - ;; The default is to link against netlib lapack. Use OpenBLAS - ;; instead. - "BLAS=-lopenblas" "LAPACK=-lopenblas" - - (string-append "INSTALL_LIB=" - (assoc-ref %outputs "out") "/lib") - (string-append "INSTALL_INCLUDE=" - (assoc-ref %outputs "out") "/include") - "library") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'correct-build-configuration - (lambda _ - ;; Invert build order: CHOLMOD before KLU. - (substitute* "Makefile" - (("\t\\( cd CHOLMOD ; \\$\\(MAKE\\) \\)\n$") - "") - (("\\( cd KLU ; \\$\\(MAKE\\) \\)") - (string-append "( cd CHOLMOD ; $(MAKE) )\n\t" - "( cd KLU ; $(MAKE) )"))) - ;; Build shared libraries. - (substitute* (find-files "." "akefile$") - (("lib([a-z]+)\\.a" all libname) - (string-append "lib" libname ".so"))) - ;; Delete broken KLU Demo step. - (substitute* "KLU/Makefile" - (("\\( cd Demo ; \\$\\(MAKE\\) \\)") - "")))) - (replace 'install - (lambda _ - ;; Install libraries. - (for-each - (lambda (x) - (install-file - x - (string-append (assoc-ref %outputs "out") "/lib"))) - (find-files "." "\\.so$")) - ;; Install header files. - (for-each - (lambda (x) - (install-file - x - (string-append (assoc-ref %outputs "out") "/include"))) - (find-files "." "\\.h$")))) - ,@(if (target-riscv64?) - ;; GraphBLAS FTBFS on riscv64-linux - `((add-after 'unpack 'skip-graphblas - (lambda _ - (substitute* "Makefile" - ((".*cd GraphBLAS.*") "") - (("metisinstall gbinstall moninstall") - "moninstall"))))) - '()) - (delete 'configure)))) ;no configure script - (inputs - (list tbb openblas gmp mpfr)))) - (define-public atlas (package (name "atlas")