<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b04a5b4ea7aa9bdf0bc8774d0ece264af83c1e48">https://github.com/macports/macports-ports/commit/b04a5b4ea7aa9bdf0bc8774d0ece264af83c1e48</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 b04a5b4ea7a eo: Fix cmake usage to fix configure failure
</span>b04a5b4ea7a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b04a5b4ea7aa9bdf0bc8774d0ece264af83c1e48
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Sep 1 18:46:09 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> eo: Fix cmake usage to fix configure failure
</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/68080
</span>---
science/eo/Portfile | 19 +++++++-----
science/eo/files/ConfigureChecks.cmake.patch | 35 ++++++++++++++++++++++
.../patch-src-utils-eoGnuplot1DSnapshot.h.diff | 14 ++++-----
...-rename-string.h.diff => rename-String.h.patch} | 2 ++
4 files changed, 56 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/eo/Portfile b/science/eo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c6d30fe572..ab580d3d694 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/eo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/eo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,6 @@ license LGPL-2.1+
</span> version 1.3.1
revision 0
categories science math
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers openmaintainer {jochen @jokuha}
description an evolutionary computation library
long_description Evolving Objects (EO) is a templates-based, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,19 +28,25 @@ distname EO-${version}
</span> use_zip yes
worksrcdir eo
checksums rmd160 d0882988b4e6debbe059bfd4183ced54bf0f2d1d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 230886e0c857a8497b2e1c892ff2bfa1d9d4115199d9267b3bdb89ff0f846850
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 230886e0c857a8497b2e1c892ff2bfa1d9d4115199d9267b3bdb89ff0f846850 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4860892
</span>
depends_lib port:gnuplot
#TODO: Add support for mpi, openmp, boost
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-utils-eoGnuplot1DSnapshot.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-rename-string.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/torognes/vsearch/issues/91
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid conflict with standard string.h header on case-insensitive filesystems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/torognes/vsearch/issues/91
</span> file rename ${worksrcpath}/src/serial/String.h ${worksrcpath}/src/serial/serial_String.h
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DOS to UNIX line endings so we can patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\r||g" ${worksrcpath}/ConfigureChecks.cmake
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles ConfigureChecks.cmake.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-utils-eoGnuplot1DSnapshot.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rename-String.h.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append -DENABLE_CMAKE_TESTING:BOOL=ON
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/eo/files/ConfigureChecks.cmake.patch b/science/eo/files/ConfigureChecks.cmake.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bb41df7a22d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/eo/files/ConfigureChecks.cmake.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix invalid usage of CHECK_INCLUDE_FILES that causes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CMake Error at /opt/local/share/cmake-3.24/Modules/CheckIncludeFiles.cmake:70 (message):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Unknown arguments:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_MATH_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.openmodelica.org/OpenModelica/attachment/ticket/5409/paradiseo-cmake.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ConfigureChecks.cmake.orig 2023-09-01 18:37:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ConfigureChecks.cmake 2023-09-01 18:37:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,15 +8,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_LIBRARY_EXISTS(m cos "/usr/lib" HAVE_LIBM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(math.h "math.h" HAVE_MATH_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(stdio.h "stdio.h" HAVE_STDIO_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(stdlib.h "stdlib.h" HAVE_STDLIB_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(string.h "string.h" HAVE_STRING_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(strings.h "strings.h" HAVE_STRINGS_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(malloc.h "malloc.h" HAVE_MALLOC_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(limits.h "limits.h" HAVE_LIMITS_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(unistd.h "unistd.h" HAVE_UNISTD_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CHECK_INCLUDE_FILES(stdint.h "stdint.h" HAVE_STDINT_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("math.h" HAVE_MATH_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("stdio.h" HAVE_STDIO_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("stdlib.h" HAVE_STDLIB_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("string.h" HAVE_STRING_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("strings.h" HAVE_STRINGS_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("malloc.h" HAVE_MALLOC_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("unistd.h" HAVE_UNISTD_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_INCLUDE_FILES("stdint.h" HAVE_STDINT_H)
</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;'>+ # Use check_symbol_exists to check for symbols in a reliable
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/eo/files/patch-src-utils-eoGnuplot1DSnapshot.h.diff b/science/eo/files/patch-src-utils-eoGnuplot1DSnapshot.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fe2b70a157e..c7a65315a4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/eo/files/patch-src-utils-eoGnuplot1DSnapshot.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/eo/files/patch-src-utils-eoGnuplot1DSnapshot.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/utils/eoGnuplot1DSnapshot.h.orig 2016-01-26 12:13:11.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/utils/eoGnuplot1DSnapshot.h 2016-01-26 12:13:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/utils/eoGnuplot1DSnapshot.h.orig 2012-07-26 17:07:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/utils/eoGnuplot1DSnapshot.h 2023-09-01 18:34:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span> std::string _filename = "gen", std::string _delim = " ",
unsigned _counter = 0, bool _rmFiles = true) :
eoFileSnapshot(_dirname, _frequency, _filename, _delim, _counter, _rmFiles),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,16 +9,16 @@
</span> pointSize(5)
{}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +65,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned _frequency = 1, std::string _filename = "gen",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string _delim = " ", unsigned _counter = 0, bool _rmFiles = true ) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned _frequency = 1, std::string _filename = "gen",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string _delim = " ", unsigned _counter = 0, bool _rmFiles = true ) :
</span> eoFileSnapshot(_dirname, _frequency, _filename, _delim, _counter, _rmFiles),
- eoGnuplot(_filename,"set data style points"),
+ eoGnuplot(_filename,"set style data points"),
pointSize(5)
{
handleBounds(_bounds);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,14 +73,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,14 +75,14 @@
</span> // Ctor
eoGnuplot1DSnapshot(eoFileSnapshot & _fSnapshot) :
eoFileSnapshot(_fSnapshot),
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/eo/files/patch-rename-string.h.diff b/science/eo/files/rename-String.h.patch
</span>similarity index 91%
rename from science/eo/files/patch-rename-string.h.diff
rename to science/eo/files/rename-String.h.patch
<span style='display:block; white-space:pre;color:#808080;'>index 5ec6f047713..9eeb681a5fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/eo/files/patch-rename-string.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/eo/files/rename-String.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Avoid conflict with standard string.h header on case-insensitive filesystems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/torognes/vsearch/issues/91
</span> --- src/serial/eoSerial.h.orig 2016-01-26 15:26:43.000000000 +0100
+++ src/serial/eoSerial.h 2016-01-26 15:24:02.000000000 +0100
@@ -26,7 +26,7 @@
</pre><pre style='margin:0'>
</pre>