<pre style='margin:0'>
David Strubbe (dstrubbe) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f730e04b957f469a3b95bd0b2ece01b8f2fafaad">https://github.com/macports/macports-ports/commit/f730e04b957f469a3b95bd0b2ece01b8f2fafaad</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f730e04b957 sparskit: Fix argument mismatch build failure with gcc10.
</span>f730e04b957 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f730e04b957f469a3b95bd0b2ece01b8f2fafaad
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Mon Apr 12 12:04:15 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> sparskit: Fix argument mismatch build failure with gcc10.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also, fix fuzz and offsets in patches, and use configure flags in more canonical way.
</span>---
science/sparskit/Portfile | 7 +++++--
science/sparskit/files/patch-INFO-makefile.diff | 3 +--
science/sparskit/files/patch-MATGEN-FEM-makefile.diff | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/sparskit/Portfile b/science/sparskit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d1b6d76ecd..ad85c4ce7bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/sparskit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/sparskit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,13 +35,16 @@ patchfiles patch-makefile.diff \
</span>
compilers.choose fc
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.allow_arguments_mismatch yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args OPT="-c -O3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.optflags -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args OPT="-c ${configure.fcflags}"
</span>
use_parallel_build yes
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.args FFLAGS=-O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args FFLAGS="${configure.fcflags}"
</span> # test requires FC, FFLAGS set because test makefiles lack explicit rule for .f -> .o and these are in the implicit rule
pre-build {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/sparskit/files/patch-INFO-makefile.diff b/science/sparskit/files/patch-INFO-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 460e2e9ff5d..c4da4269a2e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/sparskit/files/patch-INFO-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/sparskit/files/patch-INFO-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> --- INFO/makefile.orig 2013-09-30 23:36:16.000000000 -0400
+++ INFO/makefile 2013-09-30 23:36:42.000000000 -0400
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span> FILES = rinfo1.o dinfo13.o
## needs library libskit.a in whatever machine version --
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/sparskit/files/patch-MATGEN-FEM-makefile.diff b/science/sparskit/files/patch-MATGEN-FEM-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3708f35bbef..d487a32250f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/sparskit/files/patch-MATGEN-FEM-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/sparskit/files/patch-MATGEN-FEM-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span> --- MATGEN/FEM/makefile.orig 2013-09-30 23:43:17.000000000 -0400
+++ MATGEN/FEM/makefile 2013-09-30 23:43:29.000000000 -0400
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,8 +6,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> FILES = convdif.o functns2.o
-fem.ex: $(FILES) ../../UNSUPP/PLOTS/psgrd.o ../../libskit32.a
</pre><pre style='margin:0'>
</pre>