pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

suitesparse: Use different hack to fix Alma 8 build



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Wed Dec 18 15:21:26 2024 -0600
Changeset:	2d2f32b6072c7b839383f109d3c4a2b999a81beb

Modified Files:
	suitesparse/distinfo
	suitesparse/patches/patch-ParU_Source_paru__init__rowFronts.cpp

Log Message:
suitesparse: Use different hack to fix Alma 8 build

Removing Sym from shared() caused build failure on macOS
Remove const from Sym def instead

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2d2f32b6072c7b839383f109d3c4a2b999a81beb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 suitesparse/distinfo                               |  2 +-
 .../patch-ParU_Source_paru__init__rowFronts.cpp    | 30 ++++++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diffs:
diff --git a/suitesparse/distinfo b/suitesparse/distinfo
index e2288e2769..abb34acb9e 100644
--- a/suitesparse/distinfo
+++ b/suitesparse/distinfo
@@ -4,5 +4,5 @@ BLAKE2s (SuiteSparse-7.8.2.tar.gz) = 098fcd79dfe355e65b366e112745fa77dab1889cc48
 SHA512 (SuiteSparse-7.8.2.tar.gz) = beb9ea85b47e46785a91913d0b52ef86a59f797f3a3a6df4fced31c4f990277ef627b6baae52256dea10e60e4eff5e82e8b5a3d6e20a63de47953674cf34f921
 Size (SuiteSparse-7.8.2.tar.gz) = 87337633 bytes
 SHA1 (patch-GraphBLAS_CMakeLists.txt) = 2f32b3534f08bcfd7fa5fc53dccbc6fd283a9976
-SHA1 (patch-ParU_Source_paru__init__rowFronts.cpp) = 88cb3a0a5ebcb5809315d21813335b43358ee8a8
+SHA1 (patch-ParU_Source_paru__init__rowFronts.cpp) = e6f7cf946b29fb7b7b1f6867f3d68c7d6f320e08
 SHA1 (patch-SPQR_Source_spqr__factorize.cpp) = f8ad367e749435058f8df7c3961af8cf8b7dfb95
diff --git a/suitesparse/patches/patch-ParU_Source_paru__init__rowFronts.cpp b/suitesparse/patches/patch-ParU_Source_paru__init__rowFronts.cpp
index f588971ad2..49b3ded54d 100644
--- a/suitesparse/patches/patch-ParU_Source_paru__init__rowFronts.cpp
+++ b/suitesparse/patches/patch-ParU_Source_paru__init__rowFronts.cpp
@@ -1,15 +1,23 @@
 $NetBSD$
 
-# Silence compiler error on Alma8: Sym is predetermined 'shared'
+# Hack for Alma (RHEL) 8
 
---- ParU/Source/paru_init_rowFronts.cpp.orig	2024-12-18 14:04:59.003674095 +0000
+--- ParU/Source/paru_init_rowFronts.cpp.orig	2024-12-18 21:05:00.880749971 +0000
 +++ ParU/Source/paru_init_rowFronts.cpp
-@@ -439,7 +439,7 @@ ParU_Info paru_init_rowFronts
-     // copying Diag_map
-     if (Diag_map)
-     {
--        #pragma omp taskloop default(none) shared(Sym, Diag_map, inv_Diag_map) \
-+        #pragma omp taskloop default(none) shared(Diag_map, inv_Diag_map) \
-         grainsize(512)
-         for (int64_t i = 0; i < Sym->n; i++)
-         {
+@@ -34,7 +34,15 @@ ParU_Info paru_init_rowFronts
+     ParU_Numeric *Num_handle,
+     // inputs, not modified:
+     cholmod_sparse *A,
+-    const ParU_Symbolic Sym     // symbolic analysis
++    // gcc on Alma 8 actually errors out on line 443:
++    // error: "Sym" is predetermined "shared" for "shared"
++    // It's dumb to error out when the programmer just restates a default,
++    // but some extant versions of gcc do this, while others (and clang)
++    // error out if Sym is not included in the shared list.  Removing
++    // default(none) is risky, as behavior may differ with different
++    // compilers.
++    // const ParU_Symbolic Sym     // symbolic analysis
++    ParU_Symbolic Sym     // symbolic analysis
+ )
+ {
+ 


Home | Main Index | Thread Index | Old Index