<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e88dc2b57f85b54b0c02b434576bc11e40cf9aae">https://github.com/macports/macports-ports/commit/e88dc2b57f85b54b0c02b434576bc11e40cf9aae</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e88dc2b57f85b54b0c02b434576bc11e40cf9aae
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu May 6 12:11:16 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> mysql57: avoid collision with C++17 header <version>
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/62784
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span>---
databases/mysql57/Portfile | 8 ++++++++
databases/mysql57/files/patch-rename_version.diff | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql57/Portfile b/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6b221ef409..aee7f270125 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,6 +87,14 @@ if {$subport eq $name} {
</span> ${cmake.build_dir}/macports/my.cnf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-rename_version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid collision with C++17 header <version>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-delete \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql57/files/patch-rename_version.diff b/databases/mysql57/files/patch-rename_version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d00f6f7a9d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql57/files/patch-rename_version.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;'>+--- a/cmake/mysql_version.cmake 2021-03-25 23:58:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/mysql_version.cmake 2021-05-06 11:18:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Generate "something" to trigger cmake rerun when VERSION changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIGURE_FILE(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_SOURCE_DIR}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_BINARY_DIR}/VERSION.dep
</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;'>+--- a/cmake/mysql_version.cmake 2021-05-06 11:23:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/mysql_version.cmake 2021-05-06 11:25:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT ${var})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REPLACE "${keyword}=" "" str ${str})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REGEX REPLACE "[ ].*" "" str "${str}")
</span></pre><pre style='margin:0'>
</pre>