<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8b7d032eacddc1d81ded2f26331109a29ed81efe">https://github.com/macports/macports-ports/commit/8b7d032eacddc1d81ded2f26331109a29ed81efe</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8b7d032eacddc1d81ded2f26331109a29ed81efe
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Sat Jun 22 03:31:16 2019 +0800

<span style='display:block; white-space:pre;color:#404040;'>    percona: update to 8.0.15-6
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * RocksDB does not build. Some relevant discussions:
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    https://jira.percona.com/browse/PS-2285
</span><span style='display:block; white-space:pre;color:#404040;'>    https://jira.percona.com/browse/PS-4116
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    I tried a few patching tricks. With this patch:
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    --- storage/rocksdb/CMakeLists.txt.orig      2019-06-22 02:42:18.000000000 +0800
</span><span style='display:block; white-space:pre;color:#404040;'>    +++ storage/rocksdb/CMakeLists.txt   2019-06-22 02:42:08.000000000 +0800
</span><span style='display:block; white-space:pre;color:#404040;'>    @@ -103,6 +103,8 @@
</span><span style='display:block; white-space:pre;color:#404040;'>         IF(HAVE_FALLOCATE AND HAVE_LINUX_FALLOC_H)
</span><span style='display:block; white-space:pre;color:#404040;'>           ADD_DEFINITIONS(-DROCKSDB_FALLOCATE_PRESENT)
</span><span style='display:block; white-space:pre;color:#404040;'>         ENDIF()
</span><span style='display:block; white-space:pre;color:#404040;'>    +  elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
</span><span style='display:block; white-space:pre;color:#404040;'>    +    add_definitions(-DOS_MACOSX)
</span><span style='display:block; white-space:pre;color:#404040;'>       ENDIF()
</span><span style='display:block; white-space:pre;color:#404040;'>     ENDIF()
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    @@ -184,7 +186,7 @@
</span><span style='display:block; white-space:pre;color:#404040;'>       ${ROCKSDB_LIB_SOURCES}
</span><span style='display:block; white-space:pre;color:#404040;'>     )
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    -SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} regex "-lrt")
</span><span style='display:block; white-space:pre;color:#404040;'>    +SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} regex)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>     MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY
</span><span style='display:block; white-space:pre;color:#404040;'>       LINK_LIBRARIES ${rocksdb_static_libs}
</span><span style='display:block; white-space:pre;color:#404040;'>    --- storage/rocksdb/rdb_buff.h
</span><span style='display:block; white-space:pre;color:#404040;'>    +++ storage/rocksdb/rdb_buff.h
</span><span style='display:block; white-space:pre;color:#404040;'>    @@ -30,6 +30,16 @@
</span><span style='display:block; white-space:pre;color:#404040;'>     #include <string>
</span><span style='display:block; white-space:pre;color:#404040;'>     #include <vector>
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    +#if __APPLE__
</span><span style='display:block; white-space:pre;color:#404040;'>    +#include <libkern/OSByteOrder.h>
</span><span style='display:block; white-space:pre;color:#404040;'>    +#define htobe64(x) OSSwapHostToBigInt64(x)
</span><span style='display:block; white-space:pre;color:#404040;'>    +#define be64toh(x) OSSwapBigToHostInt64(x)
</span><span style='display:block; white-space:pre;color:#404040;'>    +#define htobe32(x) OSSwapHostToBigInt32(x)
</span><span style='display:block; white-space:pre;color:#404040;'>    +#define be32toh(x) OSSwapBigToHostInt32(x)
</span><span style='display:block; white-space:pre;color:#404040;'>    +#define htobe16(x) OSSwapHostToBigInt16(x)
</span><span style='display:block; white-space:pre;color:#404040;'>    +#define be16toh(x) OSSwapBigToHostInt16(x)
</span><span style='display:block; white-space:pre;color:#404040;'>    +#endif
</span><span style='display:block; white-space:pre;color:#404040;'>    +
</span><span style='display:block; white-space:pre;color:#404040;'>     namespace myrocks {
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>     /*
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    RocksDB still fails when building ha_rocksdb.cc. A MariaDB commit [1]
</span><span style='display:block; white-space:pre;color:#404040;'>    seems related, but it does not apply on top of this Percona version.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Many tricks in Portfile are borrowed from mysql8. Examples are the
</span><span style='display:block; white-space:pre;color:#404040;'>    boost workaround, compiler selection, legacysupport port group and
</span><span style='display:block; white-space:pre;color:#404040;'>    configurations about debug/non-debug variants.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * There are no more sample configuration files. There are no hard-coded
</span><span style='display:block; white-space:pre;color:#404040;'>    /etc/my.cnf paths found in the Percona code base, either.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Skip running libmysql_api_test - it doesn't work as it uses absolute
</span><span style='display:block; white-space:pre;color:#404040;'>    paths for percona dylibs during the build.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Switch to cmake 1.1 port group
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/55912
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/50960
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/47197
</span>---
 databases/percona/Portfile                         | 95 +++++++++++++++-------
 .../files/patch-cmake-install_layout.cmake.diff    | 12 +--
 .../percona/files/patch-cmake-lzma.cmake.diff      | 11 +++
 .../files/patch-libmysql-CMakeLists.txt.diff       | 12 +++
 4 files changed, 93 insertions(+), 37 deletions(-)

<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 f1e5c6d..4626964 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;'>@@ -5,11 +5,12 @@ PortSystem          1.0
</span> name                percona
 set name_mysql      ${name}
 set name_package    ${name}-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_mysql   5.6.32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set release         78.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_mysql   8.0.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set release         6
</span> # Please set revision_client and revision_server to 0 if you bump version_mysql or release.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 2
</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 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set boost_version   1.68.0
</span> version             ${version_mysql}-${release}
 categories          databases
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,31 +20,54 @@ homepage            http://www.percona.com/
</span> 
 if {$subport eq $name} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup           cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup           cmake 1.1
</span>     PortGroup           select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup           compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup           legacysupport 1.0
</span> 
     set version_branch  [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set boost_distver   [join [split ${boost_version} .] _]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set boost_distname  boost_${boost_distver}
</span> 
     revision            ${revision_client}
     license             GPL-2
     description         Multithreaded SQL database server
     long_description    Percona is a fork of the MySQL server, a multi-threaded SQL database.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    master_sites \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    http://www.percona.com/redir/downloads/Percona-Server-${version_branch}/Percona-Server-${version}/source/tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    master_sites        https://www.percona.com/redir/downloads/Percona-Server-${version_branch}/Percona-Server-${version}/source/tarball:percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sourceforge:project/boost/boost/${boost_version}:boost
</span> 
     distname            ${name_package}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    distfiles           ${distname}${extract.suffix}:src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    distfiles           ${distname}${extract.suffix}:percona \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${boost_distname}${extract.suffix}:boost
</span>     use_parallel_build  yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patch.pre_args      -p1
</span><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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160  f8470414a56cd59b6b846f65cde43d68a62814d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  d94d73bf12459c57fcc8fa8018d7a08775d45ba718999a4ef0a09f543c654778
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:zlib port:tcp_wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Requires c++14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                              macports-clang-4.0 macports-clang-5.0 macports-clang-6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    compiler.whitelist clang macports-clang-7.0 macports-clang-8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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-cmake-lzma.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-libmysql-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        rmd160  904197ca867504d947eeaa7a5b1a896aa26e6471 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  25d946763aabc51bd18a547fba6be109ad083700318844e80675ae567057358b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    160116772 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${boost_distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        rmd160  2995fce4cb6d2741f47e3566626f965b7047934e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  da3411ea45622579d419bfda66f45cd0f8c32a181d84adfa936f5688388995cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    108771741
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  port:cyrus-sasl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:libevent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:lz4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:protobuf-cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:re2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:tcp_wrappers
</span>     depends_run-append  port:mysql_select
 
     select.group        mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +91,17 @@ if {$subport eq $name} {
</span>             ${cmake.build_dir}/macports/my.cnf
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # the default `cmake.build_type MacPorts` confuses Percona
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    cmake.build_type    Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # storage/innobase/btr/btr0cur.cc:2960:18: error: use of undeclared identifier 'debug_sync_set_action'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # See also https://jira.mariadb.org/browse/MDEV-11148
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            return -code error "Building Percona with debugging enabled is currently broken"
</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;'>+
</span>     if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } {
         # switch to /usr/bin/gcc and /usr/bin/g++
         # closest to SET(CMAKE_CXX_COMPILER g++) removed in the patchfile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,24 +118,26 @@ if {$subport eq $name} {
</span>                         -DMYSQL_DATADIR:PATH=${prefix}/var/db/${name_mysql} \
                         -DDEFAULT_CHARSET:STRING=utf8 \
                         -DDEFAULT_COLLATION:STRING=utf8_general_ci \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_ICU:STRING=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_LIBEVENT:STRING=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_LZ4:STRING=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_LZMA:STRING=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_PROTOBUF:STRING=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_RE2:STRING=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_SASL:STRING=system \
</span>                         -DWITH_ZLIB:STRING=system \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DWITH_UNIT_TESTS:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_UNIT_TESTS:BOOL=OFF \
</span>                         -DENABLE_GCOV:BOOL=OFF \
                         -DENABLE_DTRACE:BOOL=OFF \
                         -DWITH_EDITLINE:STRING=bundled \
                         -DWITH_LIBWRAP:BOOL=ON \
                         -DWITH_SSL:STRING=bundled \
                         -DWITH_EMBEDDED_SERVER:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DWITHOUT_TOKUDB=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set dirs ${cmake.build_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach dir ${dirs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${dir}/scripts/mysql_config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${dir}/scripts/mysqlbug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITHOUT_TOKUDB=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITHOUT_ROCKSDB=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DDOWNLOAD_BOOST=0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_BOOST:PATH="${worksrcpath}/../${boost_distname}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DINSTALL_MYSQLTESTDIR=
</span> 
     post-destroot {
         # proc portdestroot::destroot_finish fails to find and compress our man pages
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,10 +150,6 @@ if {$subport eq $name} {
</span>             # Compress all manpages with gzip
             system "$gzip -9vf ${manpage}"
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name_mysql}/support-files/my-*.cnf] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # Fix paths in sample configuration files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace -q "s|/etc/my.cnf|${prefix}/etc/${name_mysql}/my.cnf|g" ${samp_conffile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span>         set link_dir ${destroot}${prefix}/lib/${name_mysql}/mysql
         foreach link_target [glob -directory ${link_dir} -type f -nocomplain -tails libperconaserver*.*] {
             # Create compatibility simlinks
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-cmake-install_layout.cmake.diff b/databases/percona/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 59af641..63f6459 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/install_layout.cmake   2013-06-23 08:41:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/install_layout.cmake   2013-06-23 08:44:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/install_layout.cmake     2013-06-23 08:41:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/install_layout.cmake     2013-06-23 08:44:25.000000000 -0700
</span> @@ -69,7 +69,7 @@
  ENDIF()
  
  SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer), RPM, DEB, SVR4")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer), RPM, DEB, SVR4, MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, SLES")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, SLES, MACPORTS")
</span>  
  IF(UNIX)
    IF(INSTALL_LAYOUT MATCHES "RPM")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +13,8 @@
</span>      SET(CMAKE_INSTALL_PREFIX ${default_prefix}
        CACHE PATH "install prefix" FORCE)
    ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--  SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4" "MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "SLES" "STANDALONE")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "SLES" "STANDALONE" "MACPORTS")
</span>    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-cmake-lzma.cmake.diff b/databases/percona/files/patch-cmake-lzma.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e38a92c
</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-cmake-lzma.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/lzma.cmake.orig  2019-06-22 00:17:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/lzma.cmake       2019-06-22 00:18:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bundled is the default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACRO (FIND_SYSTEM_LZMA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  FIND_PATH(PATH_TO_LZMA NAMES lzma/lzma.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  FIND_PATH(PATH_TO_LZMA NAMES lzma/lzma.h lzma.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   FIND_LIBRARY(LZMA_SYSTEM_LIBRARY NAMES lzma)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   IF (PATH_TO_LZMA AND LZMA_SYSTEM_LIBRARY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SET(SYSTEM_LZMA_FOUND 1)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-libmysql-CMakeLists.txt.diff b/databases/percona/files/patch-libmysql-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0f2d988
</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-libmysql-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libmysql/CMakeLists.txt.orig   2019-06-22 00:40:07.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libmysql/CMakeLists.txt        2019-06-22 00:40:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,9 +372,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</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;'>+-# 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;'>+-  > ${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>