<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/350ffe772e21e78a83de22c3e4606b247e9d54d7">https://github.com/macports/macports-ports/commit/350ffe772e21e78a83de22c3e4606b247e9d54d7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 350ffe772e21e78a83de22c3e4606b247e9d54d7
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Mon May 27 23:04:25 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    mysql8: even though mysqlrouter is disabled, add options and patches that would be used to compile it
</span>---
 databases/mysql8/Portfile                          | 20 +++++++++--
 .../mysql8/files/patch-router-cmake-set_rpath.diff | 39 ++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/Portfile b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3614450..d147585 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +95,7 @@ if {$subport eq $name} {
</span> 
     # Build configuration
     configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DDOWNLOAD_BOOST:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        -DDOWNLOAD_BOOST=0 \
</span>         -DENABLE_DOWNLOADS:BOOL=OFF \
         -DINSTALL_LAYOUT:STRING=MACPORTS \
         -DMYSQL_DATADIR:PATH="${prefix}/var/db/${name_mysql}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,13 +103,19 @@ if {$subport eq $name} {
</span>         -DSYSCONFDIR:PATH="${prefix}/etc/${name_mysql}" \
         -DWITH_BOOST:PATH="${worksrcpath}/../${boost_distname}" \
         -DWITH_ICU:PATH="${prefix}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DWITH_ROUTER:BOOL=OFF \
</span>         -DWITH_INNODB_MEMCACHED=1 \
         -DWITH_SSL:PATH="${prefix}" \
         -DWITH_ZLIB:PATH="${prefix}"
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # FIXME: Disable building MySQL Router until we resolve link issues
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        -DWITH_ROUTER:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#       -DROUTER_INSTALL_LIBDIR="lib/${name_mysql}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#       -DROUTER_INSTALL_PLUGINDIR="lib/${name_mysql}/mysqlrouter"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     patch.pre_args  -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles      patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles      patch-cmake-install_layout.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-router-cmake-set_rpath.diff
</span> 
     post-extract {
         file mkdir ${cmake.build_dir}/macports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,6 +128,8 @@ if {$subport eq $name} {
</span>         reinplace "s|@NAME@|${name_mysql}|g" \
             ${worksrcpath}/cmake/install_layout.cmake
         reinplace "s|@NAME@|${name_mysql}|g" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/router/cmake/set_rpath.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@NAME@|${name_mysql}|g" \
</span>             ${cmake.build_dir}/macports/macports-default.cnf \
             ${cmake.build_dir}/macports/my.cnf
         reinplace "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,6 +160,12 @@ if {$subport eq $name} {
</span> 
         copy ${cmake.build_dir}/macports/my.cnf \
             ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#       move ${destroot}${prefix}/README.router \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#           ${destroot}${prefix}/doc/${name_mysql}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#       move ${destroot}${prefix}/LICENSE.router \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#           ${destroot}${prefix}/doc/${name_mysql}/
</span>     }
 
     post-install {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-router-cmake-set_rpath.diff b/databases/mysql8/files/patch-router-cmake-set_rpath.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b481690
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/patch-router-cmake-set_rpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/router/cmake/set_rpath.cmake.orig    2019-05-27 12:14:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/router/cmake/set_rpath.cmake 2019-05-27 18:46:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +73,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(ROUTER_INSTALL_DATADIR "/var/opt/mysqlrouter")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(ROUTER_INSTALL_LOGDIR "/var/opt/mysqlrouter")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(ROUTER_INSTALL_RUNTIMEDIR "/var/opt/mysqlrouter")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSEIF(INSTALL_LAYOUT STREQUAL "MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(ROUTER_INSTALL_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/etc/@NAME@-router")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(ROUTER_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/var/db/@NAME@-router")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(ROUTER_INSTALL_LOGDIR "${CMAKE_INSTALL_PREFIX}/var/log/@NAME@-router")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(ROUTER_INSTALL_RUNTIMEDIR "${CMAKE_INSTALL_PREFIX}/var/run/@NAME@-router")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(ROUTER_INSTALL_DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/@NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(ROUTER_INSTALL_SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/@NAME@-router")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(ROUTER_INSTALL_CONFIGDIR "/etc/mysqlrouter")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(ROUTER_INSTALL_DATADIR "/var/lib/mysqlrouter")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,12 +131,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "Router install directories:")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "- bindir: ${ROUTER_INSTALL_BINDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "- configdir: ${ROUTER_INSTALL_CONFIGDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "- docdir: ${ROUTER_INSTALL_DOCDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "- libdir: ${ROUTER_INSTALL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "- plugindir: ${ROUTER_INSTALL_PLUGINDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "- datadir: ${ROUTER_INSTALL_DATADIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "- sharedir: ${ROUTER_INSTALL_SHAREDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MESSAGE(STATUS "- rpath: ${CMAKE_INSTALL_RPATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "Router install directories:")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "- bindir: ${ROUTER_INSTALL_BINDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "- configdir: ${ROUTER_INSTALL_CONFIGDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "- docdir: ${ROUTER_INSTALL_DOCDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "- libdir: ${ROUTER_INSTALL_LIBDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "- plugindir: ${ROUTER_INSTALL_PLUGINDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "- datadir: ${ROUTER_INSTALL_DATADIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "- sharedir: ${ROUTER_INSTALL_SHAREDIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "- rpath: ${CMAKE_INSTALL_RPATH}")
</span></pre><pre style='margin:0'>

</pre>