<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/185b02e1a5a53b16bb7b1bd554fc27e03a3ee9d8">https://github.com/macports/macports-ports/commit/185b02e1a5a53b16bb7b1bd554fc27e03a3ee9d8</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 185b02e mysql8: prevent using external boost libs - this helps ensure we still use our included boost even if there is one installed in the ports tree
</span>185b02e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 185b02e1a5a53b16bb7b1bd554fc27e03a3ee9d8
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sun Jun 9 04:42:19 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> mysql8: prevent using external boost libs - this helps ensure we still use our included boost even if there is one installed in the ports tree
</span>---
databases/mysql8/Portfile | 7 ++++---
databases/mysql8/files/patch-sql-local-boost.diff | 19 +++++++++++++++++++
2 files changed, 23 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 1e9b60e..d994640 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;'>@@ -12,8 +12,8 @@ maintainers {gmail.com:herby.gillot @herbygillot} openmaintainer
</span> homepage https://www.mysql.com/
# Set revision_client and revision_server to 0 on version bump.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_server 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 3
</span>
set name_mysql ${name}
set version_branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +117,8 @@ if {$subport eq $name} {
</span>
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-router-cmake-set_rpath.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-router-cmake-set_rpath.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sql-local-boost.diff
</span>
post-extract {
file mkdir ${cmake.build_dir}/macports
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-sql-local-boost.diff b/databases/mysql8/files/patch-sql-local-boost.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f0c8464
</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-sql-local-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sql/CMakeLists.txt.orig 2019-04-13 07:46:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sql/CMakeLists.txt 2019-06-09 04:02:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/libbinlogevents/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Prevent Boost from including external precompiled Boost libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF(USING_LOCAL_BOOST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ADD_DEFINITIONS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -DBOOST_ALL_NO_LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</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;'>++INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR} ${BOOST_PATCHES_DIR} SYSTEM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MY_INCLUDE_SYSTEM_DIRECTORIES(ICU)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>