From unknown Thu Aug 14 22:19:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39839] [PATCH] gnu: suitesparse: Update to 5.7.1 Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Feb 2020 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39839 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39839@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15829938043120 (code B ref -1); Sat, 29 Feb 2020 16:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Feb 2020 16:30:04 +0000 Received: from localhost ([127.0.0.1]:35294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8507-0000oF-KL for submit@debbugs.gnu.org; Sat, 29 Feb 2020 11:30:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:58673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j84LD-0007wJ-Ph for submit@debbugs.gnu.org; Sat, 29 Feb 2020 10:47:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50258) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j84LB-0001Cm-QX for guix-patches@gnu.org; Sat, 29 Feb 2020 10:47:47 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j84LA-0000Bn-B1 for guix-patches@gnu.org; Sat, 29 Feb 2020 10:47:45 -0500 Received: from mout02.posteo.de ([185.67.36.66]:53623) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j84L9-0000BD-Lf for guix-patches@gnu.org; Sat, 29 Feb 2020 10:47:44 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 019BD2400FB for ; Sat, 29 Feb 2020 16:47:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1582991261; bh=DDE06OFOtri07NMrGkakungYY0xUqyukc0zYCvtVjWA=; h=From:To:Cc:Subject:Date:From; b=p1mN9m1PHUL/Libr0F1bxT6K9IDe046G6nbGyXPW3qFzzbkUw2EJBzdDo/x8t2YEH sx+l8gPv6kuhhVcyKIy03FOeexqit3jRxwZf6x5T8pwdTZcR2Dyv6TVx4N+Dbecx+E UIP051ZxYbLly4PVHTa6uumE9PbpQ16Wl7iGlCX0eBbwN3zmkYMfT0Cngi505bxIN1 mZsxDwAZw8U+aSNvg+4deaKi63RdPW7VI9+MVNGcQMJU0jXoP4/2E8fZfUPhiF+WI2 UEnqBM/6SH04wE5nUFYCyjOCyRSgRcfR9mQAVxqvvvuoEsUUh/88ehqzdnm6BFjpZU yM8nkiw66HgCQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48V9lb5ycNz9rxH; Sat, 29 Feb 2020 16:47:39 +0100 (CET) From: Felix Gruber Date: Sat, 29 Feb 2020 16:46:47 +0100 Message-Id: <20200229154647.104674-1-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.67.36.66 X-Spam-Score: 0.3 (/) X-Mailman-Approved-At: Sat, 29 Feb 2020 11:30:02 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/math.scm (suitesparse): Update to 5.7.1 [source]: The latest releases of SuiteSparse have only been published on GitHub. Fetch from git tag as GitHub releases page only contains autogenerated tarballs that guix lint complains about. [patches]: add patch for Mongoose's CMakeList.txt to find SuiteSparse_config. [arguments]: Add cmake flags used by new components GraphBLAS and Mongoose. [native-inputs]: add cmake and m4 needed to build GraphBLAS and Mongoose. --- gnu/packages/maths.scm | 26 ++++++++++++++----- .../patches/suitesparse-mongoose-cmake.patch | 18 +++++++++++++ 2 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/suitesparse-mongoose-cmake.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cab84a520b..cee626f179 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -34,6 +34,7 @@ ;;; Copyright =C2=A9 2019 Steve Sprang ;;; Copyright =C2=A9 2019 Robert Smith ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka +;;; Copyright =C2=A9 2020 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -3405,16 +3406,18 @@ Fresnel integrals, and similar related functions = as well.") (define-public suitesparse (package (name "suitesparse") - (version "4.5.5") + (version "5.7.1") (source (origin - (method url-fetch) - (uri (string-append - "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-= " - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/DrTimothyAldenDavis/SuiteSparse.gi= t") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1dnr6pmjzc2qmbkmb4shigx1l74ilf6abn7svyd6brxgvph8vadr")) + "174p3l78kv9gaa0i5hflyai2ydwnjzh34k9938sl4aa3li0543s8")) + (patches (search-patches "suitesparse-mongoose-cmake.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled metis source @@ -3429,6 +3432,14 @@ Fresnel integrals, and similar related functions a= s well.") "BLAS=3D-lblas" "TBB=3D-ltbb" "MY_METIS_LIB=3D-lmetis" + ;; Flags for cmake (only GraphBLAS and Mongoose) + (string-append "CMAKE_OPTIONS=3D-DCMAKE_INSTALL_PREFIX=3D" + (assoc-ref %outputs "out") + " -DCMAKE_VERBOSE_MAKEFILE=3DON" + " -DCMAKE_C_FLAGS_RELEASE=3D\"$(CFLAGS) $(CP= PFLAGS)\"" + " -DCMAKE_CXX_FLAGS_RELEASE=3D\"$(CXXFLAGS) = $(CPPFLAGS)\"" + " -DCMAKE_SKIP_RPATH=3DTRUE" + " -DCMAKE_BUILD_TYPE=3DRelease") (string-append "INSTALL_LIB=3D" (assoc-ref %outputs "out") "/lib") (string-append "INSTALL_INCLUDE=3D" @@ -3441,6 +3452,9 @@ Fresnel integrals, and similar related functions as= well.") `(("tbb" ,tbb) ("lapack" ,lapack) ("metis" ,metis))) + (native-inputs + `(("cmake" ,cmake) + ("m4" ,m4))) (home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html") (synopsis "Suite of sparse matrix software") (description diff --git a/gnu/packages/patches/suitesparse-mongoose-cmake.patch b/gnu/= packages/patches/suitesparse-mongoose-cmake.patch new file mode 100644 index 0000000000..e224d73a30 --- /dev/null +++ b/gnu/packages/patches/suitesparse-mongoose-cmake.patch @@ -0,0 +1,18 @@ +diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt +index 7e134ab..76fa9e2 100644 +--- a/Mongoose/CMakeLists.txt ++++ b/Mongoose/CMakeLists.txt +@@ -148,10 +148,10 @@ set(CMAKE_CXX_STANDARD 11) + #set(CMAKE_CXX_STANDARD_REQUIRED ON) + + # determine which SuiteSparse_config to use +-if (EXISTS ${PROJECT_SOURCE_DIR}/../SuiteSparse_config) +- message(STATUS "External ../SuiteSparse_config" ${BoldBlue} " found= " ${ColourReset} ".") ++if (EXISTS ${CMAKE_INSTALL_PREFIX}) ++ message(STATUS "External SuiteSparse_config" ${BoldBlue} " found" $= {ColourReset} ".") + set ( SUITESPARSE_CONFIG_DIR ${PROJECT_SOURCE_DIR}/../SuiteSparse_c= onfig ) +- link_directories ( ${PROJECT_SOURCE_DIR}/../lib ) ++ link_directories ( ${CMAKE_INSTALL_PREFIX}/lib ) + message ( STATUS "Note: ../SuiteSparse_config must be compiled befo= re compiling Mongoose" ) + set ( SUITESPARSE_CONFIG_LIBRARY suitesparseconfig ) + else () --=20 2.25.1 From unknown Thu Aug 14 22:19:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39839] [PATCH] gnu: suitesparse: Update to 5.7.1 Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Mar 2020 20:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39839 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Felix Gruber Cc: 39839@debbugs.gnu.org Received: via spool by 39839-submit@debbugs.gnu.org id=B39839.158335246226331 (code B ref 39839); Wed, 04 Mar 2020 20:08:01 +0000 Received: (at 39839) by debbugs.gnu.org; 4 Mar 2020 20:07:42 +0000 Received: from localhost ([127.0.0.1]:41894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9aIv-0006qd-U8 for submit@debbugs.gnu.org; Wed, 04 Mar 2020 15:07:42 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:42951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9aIt-0006qP-0S for 39839@debbugs.gnu.org; Wed, 04 Mar 2020 15:07:40 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 031E147D; Wed, 4 Mar 2020 15:07:32 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 04 Mar 2020 15:07:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=VlLvT3GG95CTGb6kXaA4a0Jy R+fCD6Npm2Iy5/IFQSI=; b=sv/xBRK3D3kIZD64yLk25HiDtAkmLgjF7ey84TtL TaYp/3xdgUXda0yDJU1StFtsBTLFf7bX/StNepEVzNoGoQSTH9V+CwVnUq9hMovL i9AKm1jY3FoF4/A9ZFJeMbAw9zy8q913FVSrSe+jiHjEaXRcy+F8UFXT3wrasYFt NRM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=VlLvT3 GG95CTGb6kXaA4a0JyR+fCD6Npm2Iy5/IFQSI=; b=Crm0DTLIwtZcm4SIzWNCto Bbg9Gm6fp9kKONGe062NZlS6ELyzRlsUI78ogi5WPZzn9a4BPkBfHxZU/G2GH/NC yyGmaiRbwBYN5Q+gaIlJMCTFM98hOr2xA33O396ezRQ28b/NSWUgrzqP2K+E3Hkw zJfBPRP35aD1IqkipPpLODIF9kw7mTIn1lRg9T6xm0zaJQod+jDTZ97dY6XacIAE Xr5jt31cJHsxAQ+R9IcrqObdqYntggc3PwP6pZJOFxM4lLugikqlNndA3ygM5oRM xNIN2PI49Cdl/jiky3wOy7T4IytamJlJcxsMNYNrMAotYzDdQFjWR4uXal0V18nw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddtkedgudefvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuffhomhgrih hnpehgnhhurdhorhhgpdhtrghmuhdrvgguuhdpghhithhhuhgsrdgtohhmnecukfhppeej iedruddvgedrudefkedrieefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 232F13060F09; Wed, 4 Mar 2020 15:07:32 -0500 (EST) Date: Wed, 4 Mar 2020 15:07:25 -0500 From: Leo Famulari Message-ID: <20200304200725.GA6776@jasmine.lan> References: <20200229154647.104674-1-felgru@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200229154647.104674-1-felgru@posteo.net> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, Feb 29, 2020 at 04:46:47PM +0100, Felix Gruber wrote: > * gnu/packages/math.scm (suitesparse): Update to 5.7.1 > [source]: The latest releases of SuiteSparse have only been published on > GitHub. Fetch from git tag as GitHub releases page only contains > autogenerated tarballs that guix lint complains about. > [patches]: add patch for Mongoose's CMakeList.txt to find > SuiteSparse_config. > [arguments]: Add cmake flags used by new components GraphBLAS and > Mongoose. > [native-inputs]: add cmake and m4 needed to build GraphBLAS and Mongoose. Thanks! Remember to also register the patch file in 'gnu/local.mk', mention that in the commit message, and also mention the new patch file. Check this commit for an example: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=ca5e404f9a1ff81a38a32578c9c3a6c866482a9a > - (method url-fetch) > - (uri (string-append > - "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-" > - version ".tar.gz")) > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/DrTimothyAldenDavis/SuiteSparse.git") > + (commit (string-append "v" version)))) Okay. > @@ -3429,6 +3432,14 @@ Fresnel integrals, and similar related functions as well.") > "BLAS=-lblas" > "TBB=-ltbb" > "MY_METIS_LIB=-lmetis" > + ;; Flags for cmake (only GraphBLAS and Mongoose) Can you clarify "only GraphBLAS and Mongoose" here? Like, are these flags so that we can build those components? > diff --git a/gnu/packages/patches/suitesparse-mongoose-cmake.patch b/gnu/packages/patches/suitesparse-mongoose-cmake.patch Can you add a comment at the beginning of this file explaining what problem it solves? Can you send a revised patch? From unknown Thu Aug 14 22:19:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39839] [PATCH v2] gnu: suitesparse: Update to 5.7.1 Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Mar 2020 21:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39839 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: Felix Gruber , 39839@debbugs.gnu.org Received: via spool by 39839-submit@debbugs.gnu.org id=B39839.15833581582528 (code B ref 39839); Wed, 04 Mar 2020 21:43:01 +0000 Received: (at 39839) by debbugs.gnu.org; 4 Mar 2020 21:42:38 +0000 Received: from localhost ([127.0.0.1]:41926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9bmk-0000ed-Lq for submit@debbugs.gnu.org; Wed, 04 Mar 2020 16:42:38 -0500 Received: from mout01.posteo.de ([185.67.36.65]:57852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9bme-0000eJ-NL for 39839@debbugs.gnu.org; Wed, 04 Mar 2020 16:42:32 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id DBFBC16005E for <39839@debbugs.gnu.org>; Wed, 4 Mar 2020 22:42:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583358141; bh=9rPDtuvE4BVnWAgJ6nhkl+MBlil5k240t13VEX/SGCI=; h=From:To:Cc:Subject:Date:From; b=OsAtQQiZPbnxqlehDOGkOLbrnoXrvgC4Lxe3htYdacZdWe6im4Z/zf4eidgw4UZFm PQV5KC2h9WZBupT/WkH28z/wG7hnJdtp5FwZX4352nUF+BhkA7FQa4713FJwbAEs1J D8iS8Q8rYyHhFX1ZDjHR5cxC1cuPbNLECstka+ppmE5mGCFfXs5YwXklPjTxUAeq7B uPAtVDYlyfw4RM0EURuBWTtqWzVmofsvDth/ZFsG3MDa4eqnNQyZI5ThoYfbsYK9hX gQuQZrjyQ5pHuijd2cNASfodMg9Q2qXKTNKWut8eG0ndGrkEDA1201zQIKgpUPxXep /r1NhscVzQAeQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48XnR03Z2Gz6tm8; Wed, 4 Mar 2020 22:42:20 +0100 (CET) From: Felix Gruber Date: Wed, 4 Mar 2020 22:41:08 +0100 Message-Id: <20200304214108.28605-1-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200304200725.GA6776@jasmine.lan> References: <20200304200725.GA6776@jasmine.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/math.scm (suitesparse): Update to 5.7.1 [source]: The latest releases of SuiteSparse have only been published on GitHub. Fetch from git tag as GitHub releases page only contains autogenerated tarballs that guix lint complains about. [patches]: apply patch for Mongoose's CMakeList.txt to find SuiteSparse_config. [arguments]: Add cmake flags used by new components GraphBLAS and Mongoose. [native-inputs]: add cmake and m4 needed to build GraphBLAS and Mongoose. * gnu/packages/patches/suitesparse-mongoose-cmake.patch: New file. * gnu/local.mk (dist_patch_DATA): Add new patch. --- This revised version of the patch adds suitesparse-mongoose-cmake.patch to gnu/local.mk and documents its purpose. It also clarifies that the new CMake options are required to build the Mongoose and GraphBLAS components. gnu/local.mk | 1 + gnu/packages/maths.scm | 26 +++++++++++++----- .../patches/suitesparse-mongoose-cmake.patch | 27 +++++++++++++++++++ 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/suitesparse-mongoose-cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index 857345cfad..928428e95d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1411,6 +1411,7 @@ dist_patch_DATA = \ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/spice-fix-test-armhf.patch \ %D%/packages/patches/steghide-fixes.patch \ + %D%/packages/patches/suitesparse-mongoose-cmake.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/supertux-unbundle-squirrel.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cab84a520b..a990ffc45e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -3405,16 +3406,18 @@ Fresnel integrals, and similar related functions as well.") (define-public suitesparse (package (name "suitesparse") - (version "4.5.5") + (version "5.7.1") (source (origin - (method url-fetch) - (uri (string-append - "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/DrTimothyAldenDavis/SuiteSparse.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1dnr6pmjzc2qmbkmb4shigx1l74ilf6abn7svyd6brxgvph8vadr")) + "174p3l78kv9gaa0i5hflyai2ydwnjzh34k9938sl4aa3li0543s8")) + (patches (search-patches "suitesparse-mongoose-cmake.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled metis source @@ -3429,6 +3432,14 @@ Fresnel integrals, and similar related functions as well.") "BLAS=-lblas" "TBB=-ltbb" "MY_METIS_LIB=-lmetis" + ;; Flags for cmake (required to build GraphBLAS and Mongoose) + (string-append "CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out") + " -DCMAKE_VERBOSE_MAKEFILE=ON" + " -DCMAKE_C_FLAGS_RELEASE=\"$(CFLAGS) $(CPPFLAGS)\"" + " -DCMAKE_CXX_FLAGS_RELEASE=\"$(CXXFLAGS) $(CPPFLAGS)\"" + " -DCMAKE_SKIP_RPATH=TRUE" + " -DCMAKE_BUILD_TYPE=Release") (string-append "INSTALL_LIB=" (assoc-ref %outputs "out") "/lib") (string-append "INSTALL_INCLUDE=" @@ -3441,6 +3452,9 @@ Fresnel integrals, and similar related functions as well.") `(("tbb" ,tbb) ("lapack" ,lapack) ("metis" ,metis))) + (native-inputs + `(("cmake" ,cmake) + ("m4" ,m4))) (home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html") (synopsis "Suite of sparse matrix software") (description diff --git a/gnu/packages/patches/suitesparse-mongoose-cmake.patch b/gnu/packages/patches/suitesparse-mongoose-cmake.patch new file mode 100644 index 0000000000..e5062f9aaa --- /dev/null +++ b/gnu/packages/patches/suitesparse-mongoose-cmake.patch @@ -0,0 +1,27 @@ +Fix required by suitesparse to build Mongoose + +The CMakeLists.txt of Mongoose assumes that SuiteSparse_config has been +installed into the suitesparse source directory, which is not the case +for us, as we are building suitesparse out-of-tree. + +SuiteSparse_config can instead be found in the ${CMAKE_INSTALL_PREFIX} +directory. + +diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt +index 7e134ab..76fa9e2 100644 +--- a/Mongoose/CMakeLists.txt ++++ b/Mongoose/CMakeLists.txt +@@ -148,10 +148,10 @@ set(CMAKE_CXX_STANDARD 11) + #set(CMAKE_CXX_STANDARD_REQUIRED ON) + + # determine which SuiteSparse_config to use +-if (EXISTS ${PROJECT_SOURCE_DIR}/../SuiteSparse_config) +- message(STATUS "External ../SuiteSparse_config" ${BoldBlue} " found" ${ColourReset} ".") ++if (EXISTS ${CMAKE_INSTALL_PREFIX}) ++ message(STATUS "External SuiteSparse_config" ${BoldBlue} " found" ${ColourReset} ".") + set ( SUITESPARSE_CONFIG_DIR ${PROJECT_SOURCE_DIR}/../SuiteSparse_config ) +- link_directories ( ${PROJECT_SOURCE_DIR}/../lib ) ++ link_directories ( ${CMAKE_INSTALL_PREFIX}/lib ) + message ( STATUS "Note: ../SuiteSparse_config must be compiled before compiling Mongoose" ) + set ( SUITESPARSE_CONFIG_LIBRARY suitesparseconfig ) + else () -- 2.25.1 From unknown Thu Aug 14 22:19:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Felix Gruber Subject: bug#39839: closed (Re: [PATCH v2] gnu: suitesparse: Update to 5.7.1) Message-ID: References: <20200304230841.GA15801@jasmine.lan> <20200229154647.104674-1-felgru@posteo.net> X-Gnu-PR-Message: they-closed 39839 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 39839@debbugs.gnu.org Date: Wed, 04 Mar 2020 23:09:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1583363341-14355-1" This is a multi-part message in MIME format... ------------=_1583363341-14355-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #39839: [PATCH] gnu: suitesparse: Update to 5.7.1 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 39839@debbugs.gnu.org. --=20 39839: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D39839 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1583363341-14355-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 39839-done) by debbugs.gnu.org; 4 Mar 2020 23:08:59 +0000 Received: from localhost ([127.0.0.1]:41949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9d8N-0003jJ-Fo for submit@debbugs.gnu.org; Wed, 04 Mar 2020 18:08:59 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:58593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9d8K-0003j2-85 for 39839-done@debbugs.gnu.org; Wed, 04 Mar 2020 18:08:58 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 1BEF8641; Wed, 4 Mar 2020 18:08:50 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 04 Mar 2020 18:08:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=NHvG3otjIoZXmC2c2nB5cwzW NLwA4VJMmghgUYayDbE=; b=KbJ6tSzoIvARPldMXhCuimcBo0gyLxyUSqiHn/Jh T9QMT5eTVuxICwTlO5g06rgT5SpMxNZKKcxGlLXX2EzhEuK2cgWLn5yFVe68YTDG 3r2DUZj7PCodqBACAgPaviacMC1qw+0YENIbYIjcJmZwrqyqrT4zn6kmd6PPVPvv Atg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=NHvG3o tjIoZXmC2c2nB5cwzWNLwA4VJMmghgUYayDbE=; b=ofTshIlfelPIidT0t7H1Ni HJPfXA7PSVAYKaHxn+l2uSakpaJXIQMPt2sct+8MRAj72nRYFnsRa+DFHQODsYep XQmp5foBDqhI5FmDadDdLhl0U4gBU98xeHtXqnEFagGZ8NhiVQwGBjUCxOUdfy8X tIM3qirW+NvDxEAbhDf7yCSENnWnlr7zkmbObgXISttuI4b2JN8ArjOzvshP/u7P Hgr75Hd9xY7qtveDhTlrprgANC54CgFd6Zowi0EqGBf/hrnCw69C8TjtQlcNICmn toYZfpKllfUczB8nXa4dwEpu2cIxx0EWoXrILCOQJbP1ylibLJ/hpJOqG42je7tg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddtledgtdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucfkphepjeeird duvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgr ihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 3367330612AF; Wed, 4 Mar 2020 18:08:49 -0500 (EST) Date: Wed, 4 Mar 2020 18:08:41 -0500 From: Leo Famulari To: Felix Gruber Subject: Re: [PATCH v2] gnu: suitesparse: Update to 5.7.1 Message-ID: <20200304230841.GA15801@jasmine.lan> References: <20200304200725.GA6776@jasmine.lan> <20200304214108.28605-1-felgru@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200304214108.28605-1-felgru@posteo.net> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39839-done Cc: 39839-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Wed, Mar 04, 2020 at 10:41:08PM +0100, Felix Gruber wrote: > * gnu/packages/math.scm (suitesparse): Update to 5.7.1 > [source]: The latest releases of SuiteSparse have only been published on > GitHub. Fetch from git tag as GitHub releases page only contains > autogenerated tarballs that guix lint complains about. > [patches]: apply patch for Mongoose's CMakeList.txt to find > SuiteSparse_config. > [arguments]: Add cmake flags used by new components GraphBLAS and > Mongoose. > [native-inputs]: add cmake and m4 needed to build GraphBLAS and Mongoose. > * gnu/packages/patches/suitesparse-mongoose-cmake.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add new patch. Thanks! Pushed as aac148a87b9a79b9992b8b1a9d76c217175d4a88 ------------=_1583363341-14355-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 29 Feb 2020 16:30:04 +0000 Received: from localhost ([127.0.0.1]:35294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8507-0000oF-KL for submit@debbugs.gnu.org; Sat, 29 Feb 2020 11:30:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:58673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j84LD-0007wJ-Ph for submit@debbugs.gnu.org; Sat, 29 Feb 2020 10:47:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50258) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j84LB-0001Cm-QX for guix-patches@gnu.org; Sat, 29 Feb 2020 10:47:47 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j84LA-0000Bn-B1 for guix-patches@gnu.org; Sat, 29 Feb 2020 10:47:45 -0500 Received: from mout02.posteo.de ([185.67.36.66]:53623) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j84L9-0000BD-Lf for guix-patches@gnu.org; Sat, 29 Feb 2020 10:47:44 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 019BD2400FB for ; Sat, 29 Feb 2020 16:47:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1582991261; bh=DDE06OFOtri07NMrGkakungYY0xUqyukc0zYCvtVjWA=; h=From:To:Cc:Subject:Date:From; b=p1mN9m1PHUL/Libr0F1bxT6K9IDe046G6nbGyXPW3qFzzbkUw2EJBzdDo/x8t2YEH sx+l8gPv6kuhhVcyKIy03FOeexqit3jRxwZf6x5T8pwdTZcR2Dyv6TVx4N+Dbecx+E UIP051ZxYbLly4PVHTa6uumE9PbpQ16Wl7iGlCX0eBbwN3zmkYMfT0Cngi505bxIN1 mZsxDwAZw8U+aSNvg+4deaKi63RdPW7VI9+MVNGcQMJU0jXoP4/2E8fZfUPhiF+WI2 UEnqBM/6SH04wE5nUFYCyjOCyRSgRcfR9mQAVxqvvvuoEsUUh/88ehqzdnm6BFjpZU yM8nkiw66HgCQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48V9lb5ycNz9rxH; Sat, 29 Feb 2020 16:47:39 +0100 (CET) From: Felix Gruber To: guix-patches@gnu.org Subject: [PATCH] gnu: suitesparse: Update to 5.7.1 Date: Sat, 29 Feb 2020 16:46:47 +0100 Message-Id: <20200229154647.104674-1-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.67.36.66 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sat, 29 Feb 2020 11:30:02 -0500 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/math.scm (suitesparse): Update to 5.7.1 [source]: The latest releases of SuiteSparse have only been published on GitHub. Fetch from git tag as GitHub releases page only contains autogenerated tarballs that guix lint complains about. [patches]: add patch for Mongoose's CMakeList.txt to find SuiteSparse_config. [arguments]: Add cmake flags used by new components GraphBLAS and Mongoose. [native-inputs]: add cmake and m4 needed to build GraphBLAS and Mongoose. --- gnu/packages/maths.scm | 26 ++++++++++++++----- .../patches/suitesparse-mongoose-cmake.patch | 18 +++++++++++++ 2 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/suitesparse-mongoose-cmake.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cab84a520b..cee626f179 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -34,6 +34,7 @@ ;;; Copyright =C2=A9 2019 Steve Sprang ;;; Copyright =C2=A9 2019 Robert Smith ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka +;;; Copyright =C2=A9 2020 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -3405,16 +3406,18 @@ Fresnel integrals, and similar related functions = as well.") (define-public suitesparse (package (name "suitesparse") - (version "4.5.5") + (version "5.7.1") (source (origin - (method url-fetch) - (uri (string-append - "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-= " - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/DrTimothyAldenDavis/SuiteSparse.gi= t") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1dnr6pmjzc2qmbkmb4shigx1l74ilf6abn7svyd6brxgvph8vadr")) + "174p3l78kv9gaa0i5hflyai2ydwnjzh34k9938sl4aa3li0543s8")) + (patches (search-patches "suitesparse-mongoose-cmake.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled metis source @@ -3429,6 +3432,14 @@ Fresnel integrals, and similar related functions a= s well.") "BLAS=3D-lblas" "TBB=3D-ltbb" "MY_METIS_LIB=3D-lmetis" + ;; Flags for cmake (only GraphBLAS and Mongoose) + (string-append "CMAKE_OPTIONS=3D-DCMAKE_INSTALL_PREFIX=3D" + (assoc-ref %outputs "out") + " -DCMAKE_VERBOSE_MAKEFILE=3DON" + " -DCMAKE_C_FLAGS_RELEASE=3D\"$(CFLAGS) $(CP= PFLAGS)\"" + " -DCMAKE_CXX_FLAGS_RELEASE=3D\"$(CXXFLAGS) = $(CPPFLAGS)\"" + " -DCMAKE_SKIP_RPATH=3DTRUE" + " -DCMAKE_BUILD_TYPE=3DRelease") (string-append "INSTALL_LIB=3D" (assoc-ref %outputs "out") "/lib") (string-append "INSTALL_INCLUDE=3D" @@ -3441,6 +3452,9 @@ Fresnel integrals, and similar related functions as= well.") `(("tbb" ,tbb) ("lapack" ,lapack) ("metis" ,metis))) + (native-inputs + `(("cmake" ,cmake) + ("m4" ,m4))) (home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html") (synopsis "Suite of sparse matrix software") (description diff --git a/gnu/packages/patches/suitesparse-mongoose-cmake.patch b/gnu/= packages/patches/suitesparse-mongoose-cmake.patch new file mode 100644 index 0000000000..e224d73a30 --- /dev/null +++ b/gnu/packages/patches/suitesparse-mongoose-cmake.patch @@ -0,0 +1,18 @@ +diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt +index 7e134ab..76fa9e2 100644 +--- a/Mongoose/CMakeLists.txt ++++ b/Mongoose/CMakeLists.txt +@@ -148,10 +148,10 @@ set(CMAKE_CXX_STANDARD 11) + #set(CMAKE_CXX_STANDARD_REQUIRED ON) + + # determine which SuiteSparse_config to use +-if (EXISTS ${PROJECT_SOURCE_DIR}/../SuiteSparse_config) +- message(STATUS "External ../SuiteSparse_config" ${BoldBlue} " found= " ${ColourReset} ".") ++if (EXISTS ${CMAKE_INSTALL_PREFIX}) ++ message(STATUS "External SuiteSparse_config" ${BoldBlue} " found" $= {ColourReset} ".") + set ( SUITESPARSE_CONFIG_DIR ${PROJECT_SOURCE_DIR}/../SuiteSparse_c= onfig ) +- link_directories ( ${PROJECT_SOURCE_DIR}/../lib ) ++ link_directories ( ${CMAKE_INSTALL_PREFIX}/lib ) + message ( STATUS "Note: ../SuiteSparse_config must be compiled befo= re compiling Mongoose" ) + set ( SUITESPARSE_CONFIG_LIBRARY suitesparseconfig ) + else () --=20 2.25.1 ------------=_1583363341-14355-1--