<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/87ef63266909d5d1df50548f438f5dac079e3088">https://github.com/macports/macports-ports/commit/87ef63266909d5d1df50548f438f5dac079e3088</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 87ef6326690 lis: update to 2.0.30
</span>87ef6326690 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 87ef63266909d5d1df50548f438f5dac079e3088
</span>Author: tenomoto <takeshi@macports.org>
AuthorDate: Thu Jun 24 09:41:53 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> lis: update to 2.0.30
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * added lgfortran for link with CC
</span>---
math/lis/Portfile | 16 +++++++----
math/lis/files/patch-compiler.diff | 55 ++++++++++++++------------------------
2 files changed, 31 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/lis/Portfile b/math/lis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ca5659cc44..e638d0266a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/lis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/lis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup mpi 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup anishida lis 2.0.23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup anishida lis 2.0.30
</span> revision 0
master_sites https://www.ssisc.org/lis/dl
use_zip yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +21,11 @@ long_description \
</span> a parallel software library for solving linear equations and eigenvalue problems \
that arise in the numerical solution of partial differential equations using iterative methods.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e81e8e8fc069c9d5cb08e4c1971832d2db3cfd5c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 19f29b39aad4d2c287f60eb82d95792dc30d321a734540343e7643f6a2d2aee0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3983234
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 63399bc5bbe645b86b6867932baf54dfa0702b74 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fefe1ba48aa5867cde3c07ea4009fb333baa863b535a1f29bbdf99de42f49f67 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3999895
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.setup require_fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.setup require_fortran -g95
</span> compilers.allow_arguments_mismatch \
yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,11 @@ configure.args-append \
</span> --enable-complex \
--enable-saamg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset gfortran]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gccPort [fortran_depends_port_name ${compilers.gcc_default}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/${gccPort} -lgfortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[mpi_variant_isset]} {
configure.args-append \
--enable-mpi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,3 +56,4 @@ post-destroot {
</span> file copy ${f} ${destroot}${prefix}/share/examples/${name}/
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/lis/files/patch-compiler.diff b/math/lis/files/patch-compiler.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e974abd397..a4880c56ab1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/lis/files/patch-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/lis/files/patch-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-10-26 04:34:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-10-28 09:54:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3860,19 +3860,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-01-24 11:48:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-06-24 08:43:23.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3907,29 +3907,6 @@
</span> esac
fi
-# GNU Compiler for Apple Mac OS X
-if test "$build_vendor" = "apple"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$enable_fortran" = "yes" || test "$enable_f90" = "yes" || test "$enable_saamg" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$enable_32bit" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC="gcc -m32"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FC="gfortran -m32"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC="gcc -m64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FC="gfortran -m64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -z "$CC"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CC="gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -z "$FC"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FC="gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$enable_32bit" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="$CFLAGS -m32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FCFLAGS="$FCFLAGS -m32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="$CFLAGS -m64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FCFLAGS="$FCFLAGS -m64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$enable_omp" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if $CC --version 2>&1 | grep clang > /dev/null ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OMPFLAG="-Xclang -fopenmp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="$LDFLAGS -lomp"
</span> - fi
- fi
-fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,28 +30,3 @@
</span> enable_dependency_tracking="no"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6869,24 +6856,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_mpi="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "$build_vendor" = "apple"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$enable_fortran" = "yes" || test "$enable_saamg" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$enable_32bit" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$enable_mpi" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC="mpicc -m32"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FC="mpif90 -m32"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ax_f77_mangling="lower case, underscore, no extra underscore"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$enable_mpi" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC="mpicc -m64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FC="mpif90 -m64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ax_f77_mangling="lower case, underscore, no extra underscore"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$enable_omp" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$OMPFLAG" != ""; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="$CFLAGS $OMPFLAG"
</span></pre><pre style='margin:0'>
</pre>