From patchwork Thu Oct 5 21:34:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54513 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 8727D27BBE2; Thu, 5 Oct 2023 22:38:30 +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 D5E5927BBEA for ; Thu, 5 Oct 2023 22:38:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2Z-0003GI-QN; Thu, 05 Oct 2023 17:37:51 -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 1qoW2W-0003Dl-QO for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:48 -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 1qoW2W-00044G-I1 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2o-0002dS-VG for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 11/20] gnu: Add metis-suitesparse. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38:06 +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.16965418349920 (code B ref 66129); Thu, 05 Oct 2023 21:38:06 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:14 +0000 Received: from localhost ([127.0.0.1]:48742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1y-0002Zr-Dr for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1n-0002W7-ON for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A763A240027 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541799; bh=0XrOBzYTvCj/21mlvg585BEQ7AqBdrLfZhREVmVq3F8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=QSGJE/lvKBe9oO7hVQ8PsMmx5MKg4fF4td82uvToTPmVj57+8xFGtjP0GXyQaG1Py tED7LH1oc+BDUWTPWnEJXxQfl3HFbSJSkcOjAS2me4W1vq9dDjgVyREX87YU+r7GrJ NBCVQeu2P3VNaAtQJoCwKpKM3kUiJG+lWpAhlDjp6kAqA40AniM2qAmxxiAitFbhgp by3oP1YNK/sPMX/mvg5BLFkoMaTHV0a/34SqcGzYbTgO35cxhZKSj1xCGWmuQ5ZbaQ A06bCPLvstIXJG/aIkqfGn90f/9cI3Mx6O5Aftj3ehgFlpqnYwqkszkl/LUbc489YD BMRrOQvwK4M9g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHq1q7mz9rxL; Thu, 5 Oct 2023 23:36:39 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:54 +0000 Message-ID: <24b9257141e62a20c5ab20943b496f6ba37f2687.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.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 (metis-suitesparse): New variable. --- gnu/packages/maths.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a096b24cfe..e2018d4540 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5422,6 +5422,32 @@ (define-public gklib-suitesparse (modify-inputs (package-inputs gklib) (prepend suitesparse-config))))) +(define-public metis-suitesparse + (package/inherit metis-5.2 + (name "metis-suitesparse") + (arguments + (substitute-keyword-arguments (package-arguments metis-5.2) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'prepare-cmake 'set-idxwidth + (lambda _ + (substitute* "Makefile" + (("IDXWIDTH.*=.*") + "IDXWIDTH = \"\\#define IDXTYPEWIDTH 64\"\n")))) + (add-before 'prepare-cmake 'link-suitesparse-config + (lambda _ + (substitute* "programs/CMakeLists.txt" + (("include_directories.*" all) + (string-append + all "find_package(SuiteSparse_config REQUIRED)\n")) + (("(target_link_libraries.*)GKlib(.*)" _ start end) + (string-append + start "GKlib ${SUITESPARSE_CONFIG_LIBRARIES}" end))))))) + ((#:configure-flags _) + #~(list "-DSHARED=ON" + (string-append "-DGKLIB_PATH=" #$gklib-suitesparse))))) + (inputs (list suitesparse-config gklib-suitesparse)))) + (define-public suitesparse (package (name "suitesparse")