<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c74d55e0cc40ec6602a2ce4832b293254f085e39">https://github.com/macports/macports-ports/commit/c74d55e0cc40ec6602a2ce4832b293254f085e39</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 c74d55e0cc4 elmerfem: update to 2024.07.04, fix build with gcc14
</span>c74d55e0cc4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c74d55e0cc40ec6602a2ce4832b293254f085e39
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Jul 5 17:12:47 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> elmerfem: update to 2024.07.04, fix build with gcc14
</span>---
science/elmerfem/Portfile | 19 ++++++++++++++-----
science/elmerfem/files/patch-umf4_f77wrapper.c.diff | 10 ++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/elmerfem/Portfile b/science/elmerfem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c49e9d98d4..24ad0bd9219 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/elmerfem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/elmerfem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +13,8 @@ legacysupport.newest_darwin_requires_legacy 10
</span>
# Remember to keep qt4 as a fallback until qt5 is available on old systems.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ElmerCSC elmerfem 1df67599af4e6389d46fa172e6c53354cd73863a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2024.07.01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ElmerCSC elmerfem a21b1be9009d210c8839bea8f8724bc5fb529f3b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2024.07.04
</span> revision 0
categories science
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ long_description {*}${description} making it an ideal tool for multiphysical
</span> It includes models for structural mechanics, fluid dynamics, heat transfer, \
electromagnetics and beyond. Elmer can also be used on massively parallel HPC platforms.
homepage https://www.elmerfem.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e5a6991bfc8ffec2051d39cc5d874b417cf35857 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 16588b6d131356b6b57b32ee23fc6eb0b3587281121d433b6f09639791763341 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 72793009
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 32c56bb0b88c8a1c960f59947ab517f2444431a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6a12ba531ff95cd10ae8e1832f2faff0048226962b22eccfbea3fbe9d8296de0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 72787611
</span> github.tarball_from archive
compilers.choose fc f90
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,11 @@ if {${os.platform} eq "darwin" && ${os.major} > 9} {
</span> patch-fix-gfortran-with-clang.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/ElmerCSC/elmerfem/issues/471
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-umf4_f77wrapper.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:SuiteSparse_UMFPACK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s,@CC@,${configure.cc}," ${worksrcpath}/CMakeLists.txt
reinplace "s,@CXX@,${configure.cxx}," ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +99,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span> # TODO: add variant to support MPICH, Hypre and Mumps.
configure.args-append \
-DCMAKE_Fortran_COMPILER=${configure.fc} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXTERNAL_UMFPACK=ON \
</span> -DGLX_INCLUDE_DIR=${prefix}/include \
-DUSE_CONTIGUOUS=OFF \
-DWITH_CONTRIB=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,6 +126,9 @@ configure.args-append \
</span> if {[string match macports-gcc* ${configure.compiler}]} {
configure.args-replace \
-DWITH_OpenMP=OFF -DWITH_OpenMP=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error=incompatible-pointer-types
</span> }
if {[string match *clang* ${configure.compiler}]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/elmerfem/files/patch-umf4_f77wrapper.c.diff b/science/elmerfem/files/patch-umf4_f77wrapper.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8212020a66b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/elmerfem/files/patch-umf4_f77wrapper.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fem/src/umf4_f77wrapper.c 2024-07-01 19:44:15.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fem/src/umf4_f77wrapper.c 2024-07-05 15:31:15.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,6 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "umfpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef NULL
</span></pre><pre style='margin:0'>
</pre>