<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d4bb3810b8396f88675ef3175a26d8f391abe559">https://github.com/macports/macports-ports/commit/d4bb3810b8396f88675ef3175a26d8f391abe559</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d4bb3810b8396f88675ef3175a26d8f391abe559
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Mon Jul 1 19:12:23 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> gerris: enable build on macOS 14
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/69726.
</span>---
science/gerris/Portfile | 10 +++++++++-
science/gerris/files/patch-configure.diff | 22 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerris/Portfile b/science/gerris/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fdc99936fc..669e441eb0f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gerris/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerris/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,8 @@ mpi.setup require_fortran \
</span> # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/gerris/gerris-20131206-r1.ebuild
patchfiles-append patch-fortran_lib.diff \
patch-hypre_no_mpi.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lis_names.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lis_names.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.diff
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +59,13 @@ mpi.enforce_variant lis
</span> mpi.enforce_variant fftw-3
mpi.enforce_variant lis
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} > 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</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-function-pointer-types
</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;'>+
</span> # proj port is installed in a non-standard location
configure.cppflags-append -I${prefix}/lib/proj5/include
configure.ldflags-append -L${prefix}/lib/proj5/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerris/files/patch-configure.diff b/science/gerris/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..20ed744f666
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerris/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2013-12-06 16:51:21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-07-01 13:38:23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +146,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check that pointers can be stored in doubles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING(whether pointers can be stored in doubles)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_TRY_RUN([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main () {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sizeof (void *) > sizeof (double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2013-12-06 16:51:37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-07-01 13:38:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12399,7 +12399,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main () {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sizeof (void *) > sizeof (double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span></pre><pre style='margin:0'>
</pre>