<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c0c2c0221a883fd049436925cb4f61bb02c98e8e">https://github.com/macports/macports-ports/commit/c0c2c0221a883fd049436925cb4f61bb02c98e8e</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 c0c2c02 mysql57: fixes to allow build
</span>c0c2c02 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c0c2c0221a883fd049436925cb4f61bb02c98e8e
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Feb 18 20:49:47 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> mysql57: fixes to allow build
</span>---
databases/mysql57/Portfile | 5 +++--
.../mysql57/files/patch-cmake-fix-test-env.diff | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
<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 51d287c..2284a39 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;'>@@ -35,7 +35,7 @@ if {$subport eq $name} {
</span> set boost_distver [join [split ${boost_version} .] _]
set boost_distname boost_${boost_distver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build boost protobuf3-cpp protobuf-cpp
</span>
distfiles ${distname}${extract.suffix}:mysql \
${boost_distname}${extract.suffix}:boost
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,8 @@ if {$subport eq $name} {
</span> patch-cmake-install_layout.cmake-yassl.diff \
patch-configure.cmake.diff \
patch-innodb_memcached-daemon_memcached-include-memcached-util.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lockpool.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lockpool.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-fix-test-env.diff
</span>
post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql57/files/patch-cmake-fix-test-env.diff b/databases/mysql57/files/patch-cmake-fix-test-env.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..890b8cc
</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-cmake-fix-test-env.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmysql/CMakeLists.txt 2019-02-18 20:33:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmysql/CMakeLists.txt 2019-02-18 20:33:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -367,8 +367,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_LINK_LIBRARIES(libmysql_api_test libmysql)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(COM_ENV "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(LD_PATH_VAR "LD_LIBRARY_PATH")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(LD_PATH_VAR "DYLD_LIBRARY_PATH")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(COM_ENV ${CMAKE_COMMAND} -E env "${LD_PATH_VAR}=${CMAKE_CURRENT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Verify that libmysql_api_test runs OK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND $<TARGET_FILE:libmysql_api_test>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${COM_ENV} $<TARGET_FILE:libmysql_api_test>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span></pre><pre style='margin:0'>
</pre>