pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
suitesparse: fixed up some linting stuff
Module Name: pkgsrc-wip
Committed By: Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By: nuclearkev
Date: Mon Jun 3 11:58:16 2024 -0400
Changeset: 680f26b8a27ace6c0db796b1bccfaa172965a016
Modified Files:
suitesparse/Makefile
suitesparse/distinfo
suitesparse/patches/patch-GraphBLAS_CMakeLists.txt
suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp
Log Message:
suitesparse: fixed up some linting stuff
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=680f26b8a27ace6c0db796b1bccfaa172965a016
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
suitesparse/Makefile | 6 ++++--
suitesparse/distinfo | 4 ++--
suitesparse/patches/patch-GraphBLAS_CMakeLists.txt | 13 +++----------
suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp | 2 ++
4 files changed, 11 insertions(+), 14 deletions(-)
diffs:
diff --git a/suitesparse/Makefile b/suitesparse/Makefile
index 294d287384..a086add6df 100644
--- a/suitesparse/Makefile
+++ b/suitesparse/Makefile
@@ -8,7 +8,7 @@ GITHUB_TAG= refs/tags/v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.cise.ufl.edu/research/sparse/SuiteSparse/
-COMMENT= SuiteSparse is a set of packages for sparse matrices calculation
+COMMENT= Set of packages for sparse matrices calculation
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
.include "../../mk/bsd.prefs.mk"
@@ -36,7 +36,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
# Creating shared libs for all platforms is complicated. Putting this off
# for now.
# WRKSRC_SHARED=${WRKSRC}_shared
-SVERSION= 1
+# SVERSION= 1
.if defined (WITH_METIS)
METIS= ${PREFIX}/lib/libmetis.a
@@ -119,5 +119,7 @@ do-install:
.include "../../math/metis/buildlink3.mk"
.include "../../math/mpfr/buildlink3.mk"
.include "../../math/openblas/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
.include "../../parallel/openmp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/suitesparse/distinfo b/suitesparse/distinfo
index d23bfead1a..41283140bf 100644
--- a/suitesparse/distinfo
+++ b/suitesparse/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
BLAKE2s (SuiteSparse-7.7.0.tar.gz) = ea9bc6eb64c7e24f68c1b5e9590b36f5d195a8ec7d0b919b55678f0455a8c980
SHA512 (SuiteSparse-7.7.0.tar.gz) = aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451
Size (SuiteSparse-7.7.0.tar.gz) = 85876065 bytes
-SHA1 (patch-GraphBLAS_CMakeLists.txt) = cb237ad5870615abc124ced12758cad4c893d1d1
-SHA1 (patch-SPQR_Source_spqr__factorize.cpp) = 9bb9369f9a7cac2584ea0426c847ade3fa724566
+SHA1 (patch-GraphBLAS_CMakeLists.txt) = 2f32b3534f08bcfd7fa5fc53dccbc6fd283a9976
+SHA1 (patch-SPQR_Source_spqr__factorize.cpp) = f8ad367e749435058f8df7c3961af8cf8b7dfb95
diff --git a/suitesparse/patches/patch-GraphBLAS_CMakeLists.txt b/suitesparse/patches/patch-GraphBLAS_CMakeLists.txt
index d88617bcc3..bd82b3f534 100644
--- a/suitesparse/patches/patch-GraphBLAS_CMakeLists.txt
+++ b/suitesparse/patches/patch-GraphBLAS_CMakeLists.txt
@@ -1,6 +1,8 @@
$NetBSD$
---- GraphBLAS/CMakeLists.txt.orig 2024-03-26 21:14:00.000000000 +0000
+cpu_features doesn't appear to work properly on NetBSD
+
+--- GraphBLAS/CMakeLists.txt.orig 2024-06-03 15:50:22.420795494 +0000
+++ GraphBLAS/CMakeLists.txt
@@ -125,7 +125,7 @@ endif ( )
# find cpu_features
@@ -11,12 +13,3 @@ $NetBSD$
# default: enable Google's cpu_features package
message ( STATUS "cpu_features (by google.com): enabled " )
include_directories ( "cpu_features/include" "cpu_features" "cpu_features/src" "cpu_features/include/internal" )
-@@ -412,7 +412,7 @@ if ( NOT NO_LIBM )
- endif ( )
-
- # libdl
--if ( NOT WIN32 )
-+if ( NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "NetBSD" )
- if ( BUILD_SHARED_LIBS )
- target_link_libraries ( GraphBLAS PRIVATE dl )
- endif ( )
diff --git a/suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp b/suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp
index 076d153f5f..c5db00af8a 100644
--- a/suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp
+++ b/suitesparse/patches/patch-SPQR_Source_spqr__factorize.cpp
@@ -1,5 +1,7 @@
$NetBSD: patch-SPQR_Source_spqr__factorize.cpp,v 1.1.1.1 2012/03/27 16:19:22 outpaddling Exp $
+Upstream bug, should include string
+
--- SPQR/Source/spqr_factorize.cpp.orig 2024-03-26 21:14:00.000000000 +0000
+++ SPQR/Source/spqr_factorize.cpp
@@ -36,6 +36,7 @@
Home |
Main Index |
Thread Index |
Old Index