svn commit: r466073 - in head/databases: percona57-client percona57-client/files percona57-server percona57-server/files
Florian Smeets
flo at FreeBSD.org
Sat Mar 31 18:26:53 UTC 2018
Author: flo
Date: Sat Mar 31 18:26:51 2018
New Revision: 466073
URL: https://svnweb.freebsd.org/changeset/ports/466073
Log:
- update to 5.7.21-20
- fix build with clang 6.0
PR: 226504
Approved by: maintainer timeout (3 weeks)
Added:
head/databases/percona57-client/files/patch-configure.cmake (contents, props changed)
head/databases/percona57-server/files/patch-configure.cmake (contents, props changed)
Deleted:
head/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
head/databases/percona57-server/files/patch-sql_sql__view.cc
Modified:
head/databases/percona57-client/Makefile
head/databases/percona57-client/files/patch-client_CMakeLists.txt
head/databases/percona57-client/files/patch-cmake_plugin.cmake
head/databases/percona57-client/pkg-plist
head/databases/percona57-server/Makefile
head/databases/percona57-server/distinfo
head/databases/percona57-server/files/patch-cmake_plugin.cmake
head/databases/percona57-server/files/patch-libmysql_CMakeLists.txt
Modified: head/databases/percona57-client/Makefile
==============================================================================
--- head/databases/percona57-client/Makefile Sat Mar 31 18:22:51 2018 (r466072)
+++ head/databases/percona57-client/Makefile Sat Mar 31 18:26:51 2018 (r466073)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= percona
-PORTREVISION?= 1
+PORTREVISION?= 0
PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client)
Modified: head/databases/percona57-client/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/percona57-client/files/patch-client_CMakeLists.txt Sat Mar 31 18:22:51 2018 (r466072)
+++ head/databases/percona57-client/files/patch-client_CMakeLists.txt Sat Mar 31 18:26:51 2018 (r466073)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC
+--- client/CMakeLists.txt.orig 2018-02-16 07:57:38 UTC
+++ client/CMakeLists.txt
-@@ -47,6 +47,7 @@ IF(UNIX)
+@@ -48,6 +48,7 @@ IF(UNIX)
TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
ENDIF(UNIX)
@@ -8,7 +8,7 @@
IF(NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysql_upgrade
upgrade/program.cc
-@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
+@@ -58,11 +59,14 @@ ADD_COMPILE_FLAGS(
TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core)
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
ENDIF()
@@ -18,11 +18,12 @@
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
+ ADD_DEPENDENCIES(mysqltest GenError)
+ENDIF()
ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)
-@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport percon
+@@ -80,8 +84,10 @@ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
@@ -33,7 +34,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
ADD_COMPILE_FLAGS(
-@@ -122,7 +128,6 @@ IF(WIN32)
+@@ -124,7 +130,6 @@ IF(WIN32)
ENDIF(WIN32)
SET_TARGET_PROPERTIES (
Modified: head/databases/percona57-client/files/patch-cmake_plugin.cmake
==============================================================================
--- head/databases/percona57-client/files/patch-cmake_plugin.cmake Sat Mar 31 18:22:51 2018 (r466072)
+++ head/databases/percona57-client/files/patch-cmake_plugin.cmake Sat Mar 31 18:26:51 2018 (r466073)
@@ -1,24 +1,6 @@
--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC
+++ cmake/plugin.cmake
-@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN)
- # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate
- # an additional dependency.
- # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported.
-- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+ #
-+ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case.
-+ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES})
- ENDIF()
-+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ SET_TARGET_PROPERTIES(${target} PROPERTIES
-+ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} "
-+ )
-+ ENDIF()
- ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
-
- IF(NOT ARG_MODULE_ONLY)
-@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
MYSQL_INSTALL_TARGETS(${target}
DESTINATION ${INSTALL_PLUGINDIR}
COMPONENT ${INSTALL_COMPONENT})
Added: head/databases/percona57-client/files/patch-configure.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/percona57-client/files/patch-configure.cmake Sat Mar 31 18:26:51 2018 (r466073)
@@ -0,0 +1,15 @@
+--- configure.cmake.orig 2018-01-16 23:26:09 UTC
++++ configure.cmake
+@@ -43,6 +43,12 @@ IF(UNIX)
+ ENDIF()
+
+
++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++ SET(CMAKE_SHARED_LIBRARY_C_FLAGS
++ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
++ENDIF()
++
++
+ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
+ ## We will be using gcc to generate .so files
+ ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
Modified: head/databases/percona57-client/pkg-plist
==============================================================================
--- head/databases/percona57-client/pkg-plist Sat Mar 31 18:22:51 2018 (r466072)
+++ head/databases/percona57-client/pkg-plist Sat Mar 31 18:26:51 2018 (r466073)
@@ -124,7 +124,6 @@ lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqlclient_r.so.20
lib/mysql/libmysqlclient.so
lib/mysql/libmysqlclient.so.20
-lib/mysql/libmysqlservices.a
lib/mysql/libperconaserverclient.a
lib/mysql/libperconaserverclient.so
lib/mysql/libperconaserverclient.so.20
Modified: head/databases/percona57-server/Makefile
==============================================================================
--- head/databases/percona57-server/Makefile Sat Mar 31 18:22:51 2018 (r466072)
+++ head/databases/percona57-server/Makefile Sat Mar 31 18:26:51 2018 (r466073)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= percona
-DISTVERSION= 5.7.20-18
+DISTVERSION= 5.7.21-20
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
@@ -138,7 +138,7 @@ post-patch:
@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt
# issue 220865: MySQL developers forgot that FreeBSD != Linux
@${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \
- ${WRKSRC}/cmake/plugin.cmake
+ ${WRKSRC}/configure.cmake
.include <bsd.port.pre.mk>
Modified: head/databases/percona57-server/distinfo
==============================================================================
--- head/databases/percona57-server/distinfo Sat Mar 31 18:22:51 2018 (r466072)
+++ head/databases/percona57-server/distinfo Sat Mar 31 18:26:51 2018 (r466073)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1514728385
-SHA256 (percona-server-5.7.20-18.tar.gz) = ebbdf859d571562b9c9614c29355dd73adb9021b67108edd46b67063039a28af
-SIZE (percona-server-5.7.20-18.tar.gz) = 82206679
+TIMESTAMP = 1519339070
+SHA256 (percona-server-5.7.21-20.tar.gz) = 842785e9b73c606be00ea74f568615d3427362fbeed5c136d8f509f03c9d43a6
+SIZE (percona-server-5.7.21-20.tar.gz) = 82479778
SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
SIZE (boost_1_59_0.tar.gz) = 83709983
Modified: head/databases/percona57-server/files/patch-cmake_plugin.cmake
==============================================================================
--- head/databases/percona57-server/files/patch-cmake_plugin.cmake Sat Mar 31 18:22:51 2018 (r466072)
+++ head/databases/percona57-server/files/patch-cmake_plugin.cmake Sat Mar 31 18:26:51 2018 (r466073)
@@ -1,24 +1,6 @@
--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC
+++ cmake/plugin.cmake
-@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN)
- # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate
- # an additional dependency.
- # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported.
-- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+ #
-+ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case.
-+ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES})
- ENDIF()
-+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ SET_TARGET_PROPERTIES(${target} PROPERTIES
-+ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} "
-+ )
-+ ENDIF()
- ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
-
- IF(NOT ARG_MODULE_ONLY)
-@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
MYSQL_INSTALL_TARGETS(${target}
DESTINATION ${INSTALL_PLUGINDIR}
COMPONENT ${INSTALL_COMPONENT})
Added: head/databases/percona57-server/files/patch-configure.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/percona57-server/files/patch-configure.cmake Sat Mar 31 18:26:51 2018 (r466073)
@@ -0,0 +1,15 @@
+--- configure.cmake.orig 2018-01-16 23:26:09 UTC
++++ configure.cmake
+@@ -43,6 +43,12 @@ IF(UNIX)
+ ENDIF()
+
+
++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++ SET(CMAKE_SHARED_LIBRARY_C_FLAGS
++ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
++ENDIF()
++
++
+ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
+ ## We will be using gcc to generate .so files
+ ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
Modified: head/databases/percona57-server/files/patch-libmysql_CMakeLists.txt
==============================================================================
--- head/databases/percona57-server/files/patch-libmysql_CMakeLists.txt Sat Mar 31 18:22:51 2018 (r466072)
+++ head/databases/percona57-server/files/patch-libmysql_CMakeLists.txt Sat Mar 31 18:26:51 2018 (r466073)
@@ -1,25 +1,25 @@
---- libmysql/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC
+--- libmysql/CMakeLists.txt.orig 2018-03-09 22:41:36 UTC
+++ libmysql/CMakeLists.txt
-@@ -231,7 +231,7 @@ IF(WIN32)
- ENDIF()
-
+@@ -235,7 +235,7 @@
+ ADD_SUBDIRECTORY(authentication_ldap)
+
# Merge several convenience libraries into one big perconaserverclient
--MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
+-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development)
++MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL)
# Visual Studio users need debug static library for debug projects
IF(MSVC)
-@@ -273,7 +273,8 @@ IF(NOT DISABLE_SHARED)
+@@ -271,7 +271,8 @@
# and link them together into shared library.
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+ MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
- COMPONENT SharedLibraries)
-+ COMPONENT SharedLibraries NOINSTALL)
++ COMPONENT SharedLibraries SKIP_INSTALL)
+IF(FALSE)
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -329,6 +330,7 @@ ENDIF()
+@@ -327,6 +328,7 @@
# to initialize api_calls[] array in api_test.c
#
SET(CLIENT_API_FUNCTION_LIST "")
More information about the svn-ports-all
mailing list