diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2017-07-19 15:15:42 +0000 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2017-07-19 15:15:42 +0000 |
| commit | b67d2e76a51d7683e50e7cab3bde3864beaed82c (patch) | |
| tree | a5bb8310b545e523a3e006942fe3e47bd5e5cd47 /databases/mysql57-client | |
| parent | 0a52a597bb7ace9c8d667ddb86be8ac70e8a3844 (diff) | |
| download | ports-b67d2e76a51d7683e50e7cab3bde3864beaed82c.tar.gz ports-b67d2e76a51d7683e50e7cab3bde3864beaed82c.zip | |
databases/mysql57-{client/server}: Update to 5.7.19
ChangeLog for this update: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-19.html
PR: 220849
Reviewed by: mat (mentor)
Approved by: mat (mentor)
Sponsored by: Netzkommune GmbH
Differential Revision: https://reviews.freebsd.org/D11656
Notes
Notes:
svn path=/head/; revision=446203
Diffstat (limited to 'databases/mysql57-client')
| -rw-r--r-- | databases/mysql57-client/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql57-client/files/patch-CMakeLists.txt | 18 | ||||
| -rw-r--r-- | databases/mysql57-client/files/patch-mysys_my__symlink.c | 10 |
3 files changed, 26 insertions, 5 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index a7a6a439b7ed..64447a722880 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -22,7 +22,8 @@ CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* -CMAKE_ARGS+= -DWITHOUT_SERVER=1 +CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ + -DWITH_NDBCLUSTER=1 USE_LDCONFIG+= ${PREFIX}/lib/mysql diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt index 4d202eb72f10..3e1761d68ea5 100644 --- a/databases/mysql57-client/files/patch-CMakeLists.txt +++ b/databases/mysql57-client/files/patch-CMakeLists.txt @@ -1,6 +1,16 @@ ---- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- CMakeLists.txt.orig 2017-06-22 14:13:19 UTC +++ CMakeLists.txt -@@ -606,8 +606,8 @@ ENDIF() +@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER) + SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "") + # Add storage engines and plugins. + CONFIGURE_PLUGINS() +-ELSE() +- # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1 +- ADD_SUBDIRECTORY(storage/ndb) + ENDIF() + + ADD_SUBDIRECTORY(include) +@@ -647,8 +644,8 @@ ENDIF() ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -10,7 +20,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -676,14 +676,13 @@ ELSE() +@@ -719,14 +716,13 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -26,7 +36,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() diff --git a/databases/mysql57-client/files/patch-mysys_my__symlink.c b/databases/mysql57-client/files/patch-mysys_my__symlink.c new file mode 100644 index 000000000000..1a392a41660c --- /dev/null +++ b/databases/mysql57-client/files/patch-mysys_my__symlink.c @@ -0,0 +1,10 @@ +--- mysys/my_symlink.c.orig 2017-07-19 12:10:42 UTC ++++ mysys/my_symlink.c +@@ -23,6 +23,7 @@ + #include <sys/param.h> + #include <sys/stat.h> + #endif ++#include "my_dir.h" + + /* + Reads the content of a symbolic link |