<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/a10e89ab093d10aec0ea370b91835a1c400e9d47">https://github.com/macports/macports-ports/commit/a10e89ab093d10aec0ea370b91835a1c400e9d47</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a10e89ab093d10aec0ea370b91835a1c400e9d47
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Sep 19 14:05:21 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    percona: avoid build conflict with boost
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    No revbump since port either builds correctly or not at all.
</span>---
 databases/percona/Portfile                         |  1 +
 .../percona/files/patch-local_boost_first.diff     | 68 ++++++++++++++++++++++
 2 files changed, 69 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/Portfile b/databases/percona/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d89a443..a100c88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,7 @@ if {$subport eq $name} {
</span>     patchfiles          patch-cmake-install_layout.cmake.diff \
                         patch-cmake-lzma.cmake.diff \
                         patch-protobuf.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-local_boost_first.diff \
</span>                         patch-libmysql-CMakeLists.txt.diff
 
     checksums           ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-local_boost_first.diff b/databases/percona/files/patch-local_boost_first.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ba00192
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/files/patch-local_boost_first.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do no use -isystem for Boost library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If installed, MacPorts Boost headers are found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- client/dump/CMakeLists.txt.orig        2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ client/dump/CMakeLists.txt     2019-09-17 19:53:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     -DBOOST_SYSTEM_NO_DEPRECATED)
</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(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDE_DIRECTORIES(${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;'>+ SET(MYSQLPUMP_LIB_SOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   abstract_chain_element.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mysys_ssl/CMakeLists.txt.orig  2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mysys_ssl/CMakeLists.txt       2019-09-17 20:05:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(MYSYS_AES_IMPLEMENTATION my_aes_openssl.cc)
</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(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDE_DIRECTORIES(${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;'>+ SET(MYSYS_SSL_SOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     crypt_genhash_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugin/keyring_udf/CMakeLists.txt.orig 2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugin/keyring_udf/CMakeLists.txt      2019-09-17 20:06:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # along with this program; if not, write to the Free Software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
</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;'>++INCLUDE_DIRECTORIES(${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;'>+ MYSQL_ADD_PLUGIN(keyring_udf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  keyring_udf.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sql/CMakeLists.txt.orig        2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sql/CMakeLists.txt     2019-09-17 20:06:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</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;'>++INCLUDE_DIRECTORIES(${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;'>+ INCLUDE_DIRECTORIES(SYSTEM ${ICU_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unittest/gunit/CMakeLists.txt.orig     2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unittest/gunit/CMakeLists.txt  2019-09-17 20:08:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,7 +198,7 @@
</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;'>+ # Some tests require Boost.
</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;'>++INCLUDE_DIRECTORIES(${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;'>+ MY_CHECK_CXX_COMPILER_FLAG("-fno-builtin-memcmp" HAVE_NO_BUILTIN_MEMCMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unittest/gunit/keyring/CMakeLists.txt.orig     2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unittest/gunit/keyring/CMakeLists.txt  2019-09-17 20:08:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   RETURN()
</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(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDE_DIRECTORIES(${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;'>+ INCLUDE_DIRECTORIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ${GMOCK_INCLUDE_DIRS}
</span></pre><pre style='margin:0'>

</pre>