Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases mysql57: updated to 5.7.30



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ecf4bfa0b244
branches:  trunk
changeset: 430970:ecf4bfa0b244
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu May 07 05:31:53 2020 +0000

description:
mysql57: updated to 5.7.30


Changes in MySQL 5.7.30:

JSON Notes

The rapidjson library included with MySQL has been upgraded to the GitHub snapshot of 16 January 2020. A fix for a compiler error encountered when building from the snapshot on Mac OS X has been 
added.

Packaging Notes

Binary packages that include curl rather than linking to the system curl library have been upgraded to use curl 7.69.0.

The bundled libedit library was upgraded to version 3.1.

Bugs Fixed

InnoDB: The row_upd_clust_rec_by_insert function, which marks a clustered index record as deleted and inserts an updated version of the record into the clustered index, passed an incorrect n_ext 
value (the total number of external fields) to lower level functions, causing an assertion failure.

InnoDB: An operation performed with the innodb_buffer_pool_evict debug variable set to uncompressed caused an assertion failure.

InnoDB: An add column operation caused an assertion failure. The failure was due to a dangling pointer.

InnoDB: Updating certain InnoDB system variables that take string values raised invalid read errors during Valgrind testing.

InnoDB: An insert statement on a table with a spatial index raised a record type mismatch assertion due to a tuple corruption.

InnoDB: A function that calculates undo log record size could calculate an incorrect length value in the case of a corrupted undo log record, resulting in a malloc failure. Assertion code was added 
to detect incorrect calculations.

Replication: While an SQL statement was in the process of being rewritten for the binary log so that sensitive information did not appear in plain text, if a SHOW PROCESSLIST statement was used to 
inspect the query, the query could become corrupted when it was written to the binary log, causing replication to stop. The process of rewriting the query is now kept private, and the query thread is 
updated only when rewriting is complete.

Replication: When a GRANT or REVOKE statement is only partially executed, an incident event is logged in the binary log, which makes the replication slave's applier thread stop so that the slave can 
be reconciled manually with the master. Previously, if a failed GRANT or REVOKE statement was the first statement executed in the session, no GTID was applied to the incident event (because the cache 
manager did not yet exist for the session), causing an error on the replication slave. Also, no incident event was logged in the situation where a GRANT statement created a user but then failed 
because the privileges had been specified incorrectly, again causing an error on the replication slave. Both these issues have now been fixed.

Replication: When a replication slave has a generated column that the master does not have in that table, with a secondary index on the generated column, the generated expression should be evaluated 
and the value stored by the storage engine in the secondary index. When row-based binary logging is in use, the replication slave assigns default values to any fields that are not in the master's 
definition of the table. In the case of a generated column, which does not have a default value, the slave was previously assigning a null or a zero value to the column. This value was then stored by 
the storage engine in the secondary index, causing both the table and the index to become corrupted. To fix this issue, generated columns in a table on a replication slave are now re-evaluated before 
the values are sent to the storage engine.

Replication: In the event of an unplanned disconnection of a replication slave from the master, the reference to the master's dump thread might not be removed from the list of registered slaves, in 
which case statements that accessed the list of slaves would fail. The issue has now been fixed.

Replication: With the settings binlog_format=MIXED, tx_isolation=READ-COMMITTED, and binlog_row_image=FULL, an INSERT ... SELECT query involving a transactional storage engine omitted any columns 
with a null value from the row image written to the binary log. This happened because when processing INSERT ... SELECT statements, the columns were marked for inserts before the binary logging 
format was selected. The issue has now been fixed.

The -libs-compat RPM package is now built with system zlib to avoid problems with unrestricted export of symbols in libmysqlclient.so.18.

The Event Scheduler had a memory leak.

Under certain circumstances, a memcached command could result in reading an uninitialized memory buffer, causing a failure.

Using ALTER USER to reset an account MAX_USER_CONNECTIONS value did not take effect until all current account connections terminated, if there were any.

A materialized subquery including a condition in which a column value was used as input to a nondeterministic function produced incorrect results.

CONCAT() and CONCAT_WS() could produce incorrect results in rare cases due to incorrect substring handling.

Scheduling of events could be disturbed by removing events.

Client programs could load authentication plugins from outside the plugin library.

The server did not handle correctly a UNION in which one of the queries contained a subquery that used ORDER BY.

A query with a WHERE clause whose predicate contained a numeric value in scientific notation was not handled correctly.

In addition, attempting to insert a particular integer specified as a string caused a server exit when the string-to-integer conversion was not successful.

Previously, mysqlpump read the [mysql_dump] and [client] groups from option files. mysqlpump now additionally reads the [mysqlpump] group. The [mysql_dump] group is still accepted but is deprecated.

A multi-table UPDATE statement which updated a table joined to a derived table that joined two other tables was not optimized properly as it had been in MySQL 5.6, instead being treated as if 
STRAIGHT_JOIN had been used with the subquery creating the derived table.

diffstat:

 databases/mysql57-client/Makefile                                        |   3 +-
 databases/mysql57-client/Makefile.common                                 |  63 ++++-----
 databases/mysql57-client/PLIST                                           |   4 +-
 databases/mysql57-client/distinfo                                        |  19 +-
 databases/mysql57-client/options.mk                                      |  39 ++---
 databases/mysql57-client/patches/patch-client_mysql.cc                   |  24 +++
 databases/mysql57-client/patches/patch-cmake_curl.cmake                  |  22 +++
 databases/mysql57-client/patches/patch-cmake_ldap.cmake                  |  22 +++
 databases/mysql57-client/patches/patch-cmake_readline.cmake              |   8 +-
 databases/mysql57-client/patches/patch-cmake_ssl.cmake                   |  33 ++--
 databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h |  16 --
 databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c       |  24 ---
 databases/mysql57-server/Makefile                                        |  16 +-
 databases/mysql57-server/PLIST                                           |  37 +++-
 databases/mysql57-server/buildlink3.mk                                   |   6 +-
 15 files changed, 178 insertions(+), 158 deletions(-)

diffs (truncated from 698 to 300 lines):

diff -r 76d21b3fb74d -r ecf4bfa0b244 databases/mysql57-client/Makefile
--- a/databases/mysql57-client/Makefile Thu May 07 05:08:52 2020 +0000
+++ b/databases/mysql57-client/Makefile Thu May 07 05:31:53 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2020/05/06 14:04:24 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/05/07 05:31:53 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]*
diff -r 76d21b3fb74d -r ecf4bfa0b244 databases/mysql57-client/Makefile.common
--- a/databases/mysql57-client/Makefile.common  Thu May 07 05:08:52 2020 +0000
+++ b/databases/mysql57-client/Makefile.common  Thu May 07 05:31:53 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.24 2020/03/22 20:23:52 rillig Exp $
+# $NetBSD: Makefile.common,v 1.25 2020/05/07 05:31:53 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=      mysql-5.7.29
+DISTNAME=      mysql-5.7.30
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
@@ -48,31 +48,31 @@
 BUILD_DEFS+=           VARBASE
 
 # paths
-CMAKE_ARGS+=           -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+=           -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+=           -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+=           -DINSTALL_INFODIR="info"
-CMAKE_ARGS+=           -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+=           -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+=           -DINSTALL_MYSQLTESTDIR="share/mysql/test"
-CMAKE_ARGS+=           -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+=           -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+=           -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+=           -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+=           -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+=           -DMYSQL_DATADIR=${MYSQL_DATADIR}
+CMAKE_ARGS+=   -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_ARGS+=   -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_ARGS+=   -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_ARGS+=   -DINSTALL_INFODIR="info"
+CMAKE_ARGS+=   -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_ARGS+=   -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_ARGS+=   -DINSTALL_MYSQLTESTDIR="share/mysql/test"
+CMAKE_ARGS+=   -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_ARGS+=   -DINSTALL_SBINDIR="sbin"
+CMAKE_ARGS+=   -DINSTALL_SCRIPTDIR="bin"
+CMAKE_ARGS+=   -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_ARGS+=   -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_ARGS+=   -DMYSQL_DATADIR=${MYSQL_DATADIR}
 
-CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 
-CMAKE_ARGS+=           -DWITH_BOOST="system"
-CMAKE_ARGS+=           -DWITH_LIBEVENT="system"
-CMAKE_ARGS+=           -DWITH_LZ4="system"
-CMAKE_ARGS+=           -DWITH_SSL="system"
-CMAKE_ARGS+=           -DWITH_ZLIB="system"
-CMAKE_ARGS+=           -DDEFAULT_CHARSET=${MYSQL_CHARSET}
-CMAKE_ARGS+=           -DDEFAULT_COLLATION=${MYSQL_COLLATION}
-CMAKE_ARGS+=           -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
-
+CMAKE_ARGS+=   -DWITH_BOOST="system"
+CMAKE_ARGS+=   -DWITH_EDITLINE="system"
+CMAKE_ARGS+=   -DWITH_LIBEVENT="system"
+CMAKE_ARGS+=   -DWITH_LZ4="system"
+CMAKE_ARGS+=   -DWITH_SSL="system"
+CMAKE_ARGS+=   -DWITH_ZLIB="system"
+CMAKE_ARGS+=   -DDEFAULT_CHARSET=${MYSQL_CHARSET}
+CMAKE_ARGS+=   -DDEFAULT_COLLATION=${MYSQL_COLLATION}
+CMAKE_ARGS+=   -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
 
 # we need atomic builtins
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
@@ -117,24 +117,17 @@
 SUBST_MESSAGE.scr=     Fixing scripts.
 SUBST_NOOP_OK.scr=     yes # since RCD_SCRIPTS_SHELL may be /bin/sh
 
-# Don't use the base system "libedit" under NetBSD because MySQL expects
-# an incompatible prototype for "rl_completion_entry_function".
+# Built-in editline works fine unless devel/readline is also installed.
 .if ${OPSYS} == "NetBSD"
 USE_BUILTIN.editline=  no
 .endif
 
-.include "../../mk/readline.buildlink3.mk"
-.if ${READLINE_TYPE} == "readline"
-CMAKE_ARGS+=           -DWITH_READLINE="system"
-.else
-CMAKE_ARGS+=           -DWITH_EDITLINE="system"
-.endif
-
 CHECK_PORTABILITY_SKIP+=       packaging/deb-in/mysql-packagesource-server.config.in
 
-.include "../../mk/curses.buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
diff -r 76d21b3fb74d -r ecf4bfa0b244 databases/mysql57-client/PLIST
--- a/databases/mysql57-client/PLIST    Thu May 07 05:08:52 2020 +0000
+++ b/databases/mysql57-client/PLIST    Thu May 07 05:31:53 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2020/03/17 18:33:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2020/05/07 05:31:53 adam Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -122,7 +122,7 @@
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.16
+lib/libmysqlclient.so.20.3.17
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1
diff -r 76d21b3fb74d -r ecf4bfa0b244 databases/mysql57-client/distinfo
--- a/databases/mysql57-client/distinfo Thu May 07 05:08:52 2020 +0000
+++ b/databases/mysql57-client/distinfo Thu May 07 05:31:53 2020 +0000
@@ -1,21 +1,22 @@
-$NetBSD: distinfo,v 1.36 2020/03/17 18:33:08 adam Exp $
+$NetBSD: distinfo,v 1.37 2020/05/07 05:31:53 adam Exp $
 
-SHA1 (mysql-5.7.29.tar.gz) = 5ee9ebf33da3a3135bdadc41cef35f4d205e2049
-RMD160 (mysql-5.7.29.tar.gz) = bf95b9948331cf78c1e6880146381e69f7cf7491
-SHA512 (mysql-5.7.29.tar.gz) = d68add452102d1f6417c992aee22aadee4026147503fe0a3c7cae615cb470f2eb040cd03d01af7b5ae5d454840ce123385d472163eb10fe2216d9062281d174c
-Size (mysql-5.7.29.tar.gz) = 54438870 bytes
+SHA1 (mysql-5.7.30.tar.gz) = 47e55b66a92d12549445a0e13e577798fb571a35
+RMD160 (mysql-5.7.30.tar.gz) = 90a5e160c4f6980bb00494c7c1918abca68831e6
+SHA512 (mysql-5.7.30.tar.gz) = 494d78881ea5a7561b3e3b8f42e6e4cc07e3c23d2dda59bc50d14fa697bfb1b5bf430d06fcb0a27cb5fd9af33585d55971780c7f7cc2d961c33750c842b628a9
+Size (mysql-5.7.30.tar.gz) = 54386443 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
 SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
+SHA1 (patch-client_mysql.cc) = d30ca68d41a5c2fe71e50845e9e772ecf9fbaac5
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2
 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
+SHA1 (patch-cmake_curl.cmake) = 08ff31eb8de6b94a46ff90edb6df66a61a94fd9d
+SHA1 (patch-cmake_ldap.cmake) = 9bdc3c311330852286838e6159295ecc5fbdc0ea
 SHA1 (patch-cmake_os_SunOS.cmake) = b71c3e1fafb48ebbba77c19bb1c31556ebe1ad2a
 SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed
-SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
-SHA1 (patch-cmake_ssl.cmake) = 1954dfa0562e5e771bc6d4c6071e49086f7dfab5
-SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
-SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
+SHA1 (patch-cmake_readline.cmake) = 96ee989be126c939a4c9ef80f8cbb27e0c0719a5
+SHA1 (patch-cmake_ssl.cmake) = 85ccd0f27fdd6950368ae10fe4b8a013d2e66dfa
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
 SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
diff -r 76d21b3fb74d -r ecf4bfa0b244 databases/mysql57-client/options.mk
--- a/databases/mysql57-client/options.mk       Thu May 07 05:08:52 2020 +0000
+++ b/databases/mysql57-client/options.mk       Thu May 07 05:31:53 2020 +0000
@@ -1,43 +1,32 @@
-# $NetBSD: options.mk,v 1.3 2019/02/05 20:19:55 adam Exp $
+# $NetBSD: options.mk,v 1.4 2020/05/07 05:31:53 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql5
 
 # ndb-cluster does not configure with cmake
-PKG_SUPPORTED_OPTIONS+=        dtrace embedded-server ndb-cluster
-PKG_SUPPORTED_OPTIONS+=        memcached
+PKG_SUPPORTED_OPTIONS+=        dtrace embedded-server ldap memcached ndb-cluster
 PKG_SUGGESTED_OPTIONS+=        embedded-server
 
 .include "../../mk/bsd.options.mk"
 
 # Enable DTrace support
 .if !empty(PKG_OPTIONS:Mdtrace)
-CMAKE_ARGS+=           -DENABLE_DTRACE=ON
+CMAKE_ARGS+=   -DENABLE_DTRACE=ON
 .else
-CMAKE_ARGS+=           -DENABLE_DTRACE=OFF
+CMAKE_ARGS+=   -DENABLE_DTRACE=OFF
+.endif
+
+# LDAP support
+.if !empty(PKG_OPTIONS:Mldap)
+.include "../../databases/openldap-client/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_AUTHENTICATION_LDAP=ON
 .endif
 
 # Enable InnoDB Memcached support
-PLIST_VARS+=           memcached
+PLIST_VARS+=   memcached
 .if !empty(PKG_OPTIONS:Mmemcached)
 PLIST.memcached=       yes
-CMAKE_ARGS+=           -DWITH_INNODB_MEMCACHED=ON
-CMAKE_ARGS+=           -DWITH_BUNDLED_MEMCACHED=ON
+CMAKE_ARGS+=   -DWITH_INNODB_MEMCACHED=ON
+CMAKE_ARGS+=   -DWITH_BUNDLED_MEMCACHED=ON
 .else
-CMAKE_ARGS+=           -DWITH_INNODB_MEMCACHED=OFF
+CMAKE_ARGS+=   -DWITH_INNODB_MEMCACHED=OFF
 .endif
-
-# Enable Sphinx SE support
-# http://sphinxsearch.com/docs/current.html#sphinxse-overview
-#PLIST_VARS+=  sphinx
-#.if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
-#SPHINX_VER=   2.2.11
-#DISTFILES=    ${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-#SITES.sphinx-2.2.11-release.tar.gz=   http://sphinxsearch.com/files/
-#.  if !empty(PKGPATH:Mdatabases/mysql56-server)
-#MESSAGE_SRC=  ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
-#.  endif
-#PLIST.sphinx= yes
-
-#post-extract:
-#      ${CP} -R ${WRKDIR}/sphinx-${SPHINX_VER}-release/mysqlse ${WRKSRC}/storage/sphinx
-#.endif
diff -r 76d21b3fb74d -r ecf4bfa0b244 databases/mysql57-client/patches/patch-client_mysql.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql57-client/patches/patch-client_mysql.cc    Thu May 07 05:31:53 2020 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-client_mysql.cc,v 1.1 2020/05/07 05:31:53 adam Exp $
+
+Editline fixes.
+
+--- client/mysql.cc.orig       2020-05-06 16:48:02.000000000 +0000
++++ client/mysql.cc
+@@ -2828,7 +2828,7 @@ static int fake_magic_space(int, int);
+ char *no_completion(const char *, int)
+ #elif defined(USE_LIBEDIT_INTERFACE)
+ static int fake_magic_space(int, int);
+-char *no_completion(const char *, int)
++int no_completion(const char *, int)
+ #else
+ char *no_completion()
+ #endif
+@@ -2855,7 +2855,7 @@ static int not_in_history(const char *li
+ #if defined(USE_NEW_EDITLINE_INTERFACE)
+ static int fake_magic_space(int, int)
+ #else
+-static int fake_magic_space(int, int)
++static int fake_magic_space(const char *, int)
+ #endif
+ {
+   rl_insert(1, ' ');
diff -r 76d21b3fb74d -r ecf4bfa0b244 databases/mysql57-client/patches/patch-cmake_curl.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql57-client/patches/patch-cmake_curl.cmake   Thu May 07 05:31:53 2020 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-cmake_curl.cmake,v 1.1 2020/05/07 05:31:53 adam Exp $
+
+Do not prefer static libraries (or linking will fail).
+
+--- cmake/curl.cmake.orig      2020-05-06 20:44:17.000000000 +0000
++++ cmake/curl.cmake
+@@ -34,7 +34,6 @@ MACRO(MYSQL_CHECK_CURL)
+      ENDIF()
+      MESSAGE(STATUS "CURL_LIBRARY = ${CURL_LIBRARY}")
+    ELSEIF(WITH_CURL)
+-    LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+     FIND_LIBRARY(CURL_LIBRARY
+       NAMES curl
+       PATHS ${WITH_CURL}
+@@ -42,7 +41,6 @@ MACRO(MYSQL_CHECK_CURL)
+       NO_CMAKE_ENVIRONMENT_PATH
+       NO_SYSTEM_ENVIRONMENT_PATH
+     )
+-    LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+     MESSAGE(STATUS "CURL_LIBRARY = ${CURL_LIBRARY}")
+    ELSE()
+      MESSAGE(STATUS
diff -r 76d21b3fb74d -r ecf4bfa0b244 databases/mysql57-client/patches/patch-cmake_ldap.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql57-client/patches/patch-cmake_ldap.cmake   Thu May 07 05:31:53 2020 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-cmake_ldap.cmake,v 1.1 2020/05/07 05:31:53 adam Exp $
+
+Do not prefer static libraries (or linking will fail).
+
+--- cmake/ldap.cmake.orig      2020-05-06 20:42:06.000000000 +0000
++++ cmake/ldap.cmake
+@@ -80,7 +80,6 @@ MACRO(FIND_CUSTOM_LDAP)
+ 
+   # On mac this list is <.dylib;.so;.a>
+   # We prefer static libraries, so we reverse it here.
+-  LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+ 
+   FIND_LIBRARY(LDAP_CUSTOM_LIBRARY
+     NAMES ldap_r ldap
+@@ -97,7 +96,6 @@ MACRO(FIND_CUSTOM_LDAP)
+     NO_SYSTEM_ENVIRONMENT_PATH
+     )
+ 



Home | Main Index | Thread Index | Old Index