Attachment #191377 for bug #226504

View | Details | Raw Unified | Return to bug 226504
Collapse All | Expand All

Lines 2-8 Link Here

(-)percona57-client/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= percona	4	PORTNAME= percona
5	PORTREVISION?= 1	5	PORTREVISION?= 0
6	PKGNAMESUFFIX= 57-client	6	PKGNAMESUFFIX= 57-client
7		7
8	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)




--- client/CMakeLists.txt.orig	2018-02-16 07:57:38 UTC
+++ client/CMakeLists.txt
@@ -48,6 +48,7 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
 ENDIF(UNIX)
 

 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
     upgrade/program.cc
@@ -58,11 +59,14 @@ ADD_COMPILE_FLAGS(
 TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
 ENDIF()

 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)
@@ -80,8 +84,10 @@ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
 

 
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
@@ -124,7 +130,6 @@ IF(WIN32)
 ENDIF(WIN32)
 
 SET_TARGET_PROPERTIES (




--- cmake/plugin.cmake.orig	2017-06-22 14:13:19 UTC
+++ cmake/plugin.cmake
@@ -263,13 +270,17 @@ 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)
     MYSQL_INSTALL_TARGETS(${target}
       DESTINATION ${INSTALL_PLUGINDIR}
       COMPONENT ${INSTALL_COMPONENT})




--- 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




--- libmysql/authentication_ldap/CMakeLists.txt.orig	2017-07-20 22:54:16 UTC
+++ libmysql/authentication_ldap/CMakeLists.txt
@@ -52,8 +52,10 @@ ELSE ()
   SET(SASL_LIBRARY "sasl2")
 ENDIF ()
 
-MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
-                 auth_ldap_sasl_client.cc log_client.cc
-                 LINK_LIBRARIES ${SASL_LIBRARY}
-                 MODULE_ONLY
-                 MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
+IF (WITH_AUTHENTICATION_LDAP)
+    MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
+                     auth_ldap_sasl_client.cc log_client.cc
+                     LINK_LIBRARIES ${SASL_LIBRARY}
+                     MODULE_ONLY
+                     MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
+ENDIF()

Lines 124-130 Link Here

(-)percona57-client/pkg-plist (-1 lines)
124	lib/mysql/libmysqlclient_r.so.20	124	lib/mysql/libmysqlclient_r.so.20
125	lib/mysql/libmysqlclient.so	125	lib/mysql/libmysqlclient.so
126	lib/mysql/libmysqlclient.so.20	126	lib/mysql/libmysqlclient.so.20
127	lib/mysql/libmysqlservices.a
128	lib/mysql/libperconaserverclient.a	127	lib/mysql/libperconaserverclient.a
129	lib/mysql/libperconaserverclient.so	128	lib/mysql/libperconaserverclient.so
130	lib/mysql/libperconaserverclient.so.20	129	lib/mysql/libperconaserverclient.so.20

Lines 2-8 Link Here

(-)percona57-server/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= percona	4	PORTNAME?= percona
5	DISTVERSION= 5.7.20-18	5	DISTVERSION= 5.7.21-20
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \	8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
Lines 138-144 Link Here
138	@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt	138	@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt
139	# issue 220865: MySQL developers forgot that FreeBSD != Linux	139	# issue 220865: MySQL developers forgot that FreeBSD != Linux
140	@${REINPLACE_CMD} -e 's\|%%FREEBSD_LOCAL_LIB%%\|${LOCALBASE}/lib\|g' \	140	@${REINPLACE_CMD} -e 's\|%%FREEBSD_LOCAL_LIB%%\|${LOCALBASE}/lib\|g' \
141	${WRKSRC}/cmake/plugin.cmake	141	${WRKSRC}/configure.cmake
142		142
143	.include <bsd.port.pre.mk>	143	.include <bsd.port.pre.mk>
144		144

Lines 1-5 Link Here

(-)percona57-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1514728385	1	TIMESTAMP = 1519339070
2	SHA256 (percona-server-5.7.20-18.tar.gz) = ebbdf859d571562b9c9614c29355dd73adb9021b67108edd46b67063039a28af	2	SHA256 (percona-server-5.7.21-20.tar.gz) = 842785e9b73c606be00ea74f568615d3427362fbeed5c136d8f509f03c9d43a6
3	SIZE (percona-server-5.7.20-18.tar.gz) = 82206679	3	SIZE (percona-server-5.7.21-20.tar.gz) = 82479778
4	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac	4	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
5	SIZE (boost_1_59_0.tar.gz) = 83709983	5	SIZE (boost_1_59_0.tar.gz) = 83709983




--- cmake/plugin.cmake.orig	2017-06-22 14:13:19 UTC
+++ cmake/plugin.cmake
@@ -263,13 +270,17 @@ 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)
     MYSQL_INSTALL_TARGETS(${target}
       DESTINATION ${INSTALL_PLUGINDIR}
       COMPONENT ${INSTALL_COMPONENT})




--- 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




--- libmysql/CMakeLists.txt.orig	2018-03-09 22:41:36 UTC
+++ libmysql/CMakeLists.txt
@@ -235,7 +235,7 @@
 ADD_SUBDIRECTORY(authentication_ldap)
   
 # Merge several convenience libraries into one big perconaserverclient
-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)
@@ -271,7 +271,8 @@
   # and link them together into shared library.
   MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
-    COMPONENT SharedLibraries)
+    COMPONENT SharedLibraries SKIP_INSTALL)
+IF(FALSE)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -327,6 +328,7 @@
 # to initialize api_calls[] array in api_test.c
 #
 SET(CLIENT_API_FUNCTION_LIST "")




--- sql/sql_view.cc.orig	2016-11-27 19:44:54 UTC
+++ sql/sql_view.cc
@@ -773,46 +773,46 @@ static const int required_view_parameter
 */
 static File_option view_parameters[]=
 {{{ C_STRING_WITH_LEN("query")},
-  my_offsetof(TABLE_LIST, select_stmt),
+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
   FILE_OPTIONS_ESTRING},
  {{ C_STRING_WITH_LEN("md5")},
-  my_offsetof(TABLE_LIST, md5),
+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
   FILE_OPTIONS_STRING},
  {{ C_STRING_WITH_LEN("updatable")},
-  my_offsetof(TABLE_LIST, updatable_view),
+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
   FILE_OPTIONS_ULONGLONG},
  {{ C_STRING_WITH_LEN("algorithm")},
-  my_offsetof(TABLE_LIST, algorithm),
+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
   FILE_OPTIONS_ULONGLONG},
  {{ C_STRING_WITH_LEN("definer_user")},
-  my_offsetof(TABLE_LIST, definer.user),
+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
   FILE_OPTIONS_STRING},
  {{ C_STRING_WITH_LEN("definer_host")},
-  my_offsetof(TABLE_LIST, definer.host),
+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
   FILE_OPTIONS_STRING},
  {{ C_STRING_WITH_LEN("suid")},
-  my_offsetof(TABLE_LIST, view_suid),
+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
   FILE_OPTIONS_ULONGLONG},
  {{ C_STRING_WITH_LEN("with_check_option")},
-  my_offsetof(TABLE_LIST, with_check),
+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
   FILE_OPTIONS_ULONGLONG},
  {{ C_STRING_WITH_LEN("timestamp")},
-  my_offsetof(TABLE_LIST, timestamp),
+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
   FILE_OPTIONS_TIMESTAMP},
  {{ C_STRING_WITH_LEN("create-version")},
-  my_offsetof(TABLE_LIST, file_version),
+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
   FILE_OPTIONS_ULONGLONG},
  {{ C_STRING_WITH_LEN("source")},
-  my_offsetof(TABLE_LIST, source),
+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
   FILE_OPTIONS_ESTRING},
  {{(char*) STRING_WITH_LEN("client_cs_name")},
-  my_offsetof(TABLE_LIST, view_client_cs_name),
+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
   FILE_OPTIONS_STRING},
  {{(char*) STRING_WITH_LEN("connection_cl_name")},
-  my_offsetof(TABLE_LIST, view_connection_cl_name),
+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
   FILE_OPTIONS_STRING},
  {{(char*) STRING_WITH_LEN("view_body_utf8")},
-  my_offsetof(TABLE_LIST, view_body_utf8),
+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
   FILE_OPTIONS_ESTRING},
  {{NullS, 0},			0,
   FILE_OPTIONS_STRING}

Return to bug 226504

Lines 1-6 Link Here

(-)percona57-client/files/patch-client_CMakeLists.txt (-5 / +6 lines)
1	--- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC	1	--- client/CMakeLists.txt.orig 2018-02-16 07:57:38 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -47,6 +47,7 @@ IF(UNIX)	3	@@ -48,6 +48,7 @@ IF(UNIX)
4	TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})	4	TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
5	ENDIF(UNIX)	5	ENDIF(UNIX)
6		6
Lines 8-14 Link Here
8	IF(NOT WITHOUT_SERVER)	8	IF(NOT WITHOUT_SERVER)
9	MYSQL_ADD_EXECUTABLE(mysql_upgrade	9	MYSQL_ADD_EXECUTABLE(mysql_upgrade
10	upgrade/program.cc	10	upgrade/program.cc
11	@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(	11	@@ -58,11 +59,14 @@ ADD_COMPILE_FLAGS(
12	TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core)	12	TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core)
13	ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)	13	ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
14	ENDIF()	14	ENDIF()
Lines 18-28 Link Here
18	MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)	18	MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
19	SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")	19	SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
20	TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)	20	TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
		21	ADD_DEPENDENCIES(mysqltest GenError)
21	+ENDIF()	22	+ENDIF()
22		23
23	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	24	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
24	TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)	25	TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)
25	@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport percon	26	@@ -80,8 +84,10 @@ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
26	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)	27	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
27	TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)	28	TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
28		29
Lines 33-39 Link Here
33		34
34	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	35	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
35	ADD_COMPILE_FLAGS(	36	ADD_COMPILE_FLAGS(
36	@@ -122,7 +128,6 @@ IF(WIN32)	37	@@ -124,7 +130,6 @@ IF(WIN32)
37	ENDIF(WIN32)	38	ENDIF(WIN32)
38		39
39	SET_TARGET_PROPERTIES (	40	SET_TARGET_PROPERTIES (

Lines 1-24 Link Here

(-)percona57-client/files/patch-cmake_plugin.cmake (-19 / +1 lines)
1	--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC	1	--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC
2	+++ cmake/plugin.cmake	2	+++ cmake/plugin.cmake
3	@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN)	3	@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
4	# Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate
5	# an additional dependency.
6	# Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported.
7	- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	+ #
9	+ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case.
10	+ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
11	TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES})
12	ENDIF()
13	+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
14	+ SET_TARGET_PROPERTIES(${target} PROPERTIES
15	+ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} "
16	+ )
17	+ ENDIF()
18	ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
19
20	IF(NOT ARG_MODULE_ONLY)
21	@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN)
22	MYSQL_INSTALL_TARGETS(${target}	4	MYSQL_INSTALL_TARGETS(${target}
23	DESTINATION ${INSTALL_PLUGINDIR}	5	DESTINATION ${INSTALL_PLUGINDIR}
24	COMPONENT ${INSTALL_COMPONENT})	6	COMPONENT ${INSTALL_COMPONENT})

Line 0 Link Here

(-)percona57-client/files/patch-configure.cmake (+15 lines)
	1	--- configure.cmake.orig 2018-01-16 23:26:09 UTC
	2	+++ configure.cmake
	3	@@ -43,6 +43,12 @@ IF(UNIX)
	4	ENDIF()
	5
	6
	7	+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
	8	+ SET(CMAKE_SHARED_LIBRARY_C_FLAGS
	9	+ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
	10	+ENDIF()
	11	+
	12	+
	13	IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
	14	## We will be using gcc to generate .so files
	15	## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS

Lines 1-18 Link Here

(-)percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt (-18 lines)
1	--- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC
2	+++ libmysql/authentication_ldap/CMakeLists.txt
3	@@ -52,8 +52,10 @@ ELSE ()
4	SET(SASL_LIBRARY "sasl2")
5	ENDIF ()
6
7	-MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
8	- auth_ldap_sasl_client.cc log_client.cc
9	- LINK_LIBRARIES ${SASL_LIBRARY}
10	- MODULE_ONLY
11	- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
12	+IF (WITH_AUTHENTICATION_LDAP)
13	+ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
14	+ auth_ldap_sasl_client.cc log_client.cc
15	+ LINK_LIBRARIES ${SASL_LIBRARY}
16	+ MODULE_ONLY
17	+ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
18	+ENDIF()

Lines 1-24 Link Here

(-)percona57-server/files/patch-cmake_plugin.cmake (-19 / +1 lines)
1	--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC	1	--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC
2	+++ cmake/plugin.cmake	2	+++ cmake/plugin.cmake
3	@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN)	3	@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
4	# Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate
5	# an additional dependency.
6	# Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported.
7	- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	+ #
9	+ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case.
10	+ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
11	TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES})
12	ENDIF()
13	+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
14	+ SET_TARGET_PROPERTIES(${target} PROPERTIES
15	+ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} "
16	+ )
17	+ ENDIF()
18	ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
19
20	IF(NOT ARG_MODULE_ONLY)
21	@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN)
22	MYSQL_INSTALL_TARGETS(${target}	4	MYSQL_INSTALL_TARGETS(${target}
23	DESTINATION ${INSTALL_PLUGINDIR}	5	DESTINATION ${INSTALL_PLUGINDIR}
24	COMPONENT ${INSTALL_COMPONENT})	6	COMPONENT ${INSTALL_COMPONENT})

Line 0 Link Here

(-)percona57-server/files/patch-configure.cmake (+15 lines)
	1	--- configure.cmake.orig 2018-01-16 23:26:09 UTC
	2	+++ configure.cmake
	3	@@ -43,6 +43,12 @@ IF(UNIX)
	4	ENDIF()
	5
	6
	7	+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
	8	+ SET(CMAKE_SHARED_LIBRARY_C_FLAGS
	9	+ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
	10	+ENDIF()
	11	+
	12	+
	13	IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
	14	## We will be using gcc to generate .so files
	15	## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS

Lines 1-25 Link Here

(-)percona57-server/files/patch-libmysql_CMakeLists.txt (-10 / +10 lines)
1	--- libmysql/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC	1	--- libmysql/CMakeLists.txt.orig 2018-03-09 22:41:36 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -231,7 +231,7 @@ IF(WIN32)	3	@@ -235,7 +235,7 @@
4	ENDIF()	4	ADD_SUBDIRECTORY(authentication_ldap)
5		5
6	# Merge several convenience libraries into one big perconaserverclient	6	# Merge several convenience libraries into one big perconaserverclient
7	-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)	7	-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development)
8	+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL)	8	+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL)
9		9
10	# Visual Studio users need debug static library for debug projects	10	# Visual Studio users need debug static library for debug projects
11	IF(MSVC)	11	IF(MSVC)
12	@@ -273,7 +273,8 @@ IF(NOT DISABLE_SHARED)	12	@@ -271,7 +271,8 @@
13	# and link them together into shared library.	13	# and link them together into shared library.
14	MERGE_LIBRARIES(libmysql SHARED ${LIBS}	14	MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}	15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
16	- COMPONENT SharedLibraries)	16	- COMPONENT SharedLibraries)
17	+ COMPONENT SharedLibraries NOINSTALL)	17	+ COMPONENT SharedLibraries SKIP_INSTALL)
18	+IF(FALSE)	18	+IF(FALSE)
19	IF(UNIX)	19	IF(UNIX)
20	# libtool compatability	20	# libtool compatability
21	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)	21	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
22	@@ -329,6 +330,7 @@ ENDIF()	22	@@ -327,6 +328,7 @@
23	# to initialize api_calls[] array in api_test.c	23	# to initialize api_calls[] array in api_test.c
24	#	24	#
25	SET(CLIENT_API_FUNCTION_LIST "")	25	SET(CLIENT_API_FUNCTION_LIST "")

Lines 1-63 Link Here

(-)percona57-server/files/patch-sql_sql__view.cc (-63 lines)
1	--- sql/sql_view.cc.orig 2016-11-27 19:44:54 UTC
2	+++ sql/sql_view.cc
3	@@ -773,46 +773,46 @@ static const int required_view_parameter
4	*/
5	static File_option view_parameters[]=
6	{{{ C_STRING_WITH_LEN("query")},
7	- my_offsetof(TABLE_LIST, select_stmt),
8	+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
9	FILE_OPTIONS_ESTRING},
10	{{ C_STRING_WITH_LEN("md5")},
11	- my_offsetof(TABLE_LIST, md5),
12	+ static_cast<int>(my_offsetof(TABLE_LIST, md5)),
13	FILE_OPTIONS_STRING},
14	{{ C_STRING_WITH_LEN("updatable")},
15	- my_offsetof(TABLE_LIST, updatable_view),
16	+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
17	FILE_OPTIONS_ULONGLONG},
18	{{ C_STRING_WITH_LEN("algorithm")},
19	- my_offsetof(TABLE_LIST, algorithm),
20	+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
21	FILE_OPTIONS_ULONGLONG},
22	{{ C_STRING_WITH_LEN("definer_user")},
23	- my_offsetof(TABLE_LIST, definer.user),
24	+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
25	FILE_OPTIONS_STRING},
26	{{ C_STRING_WITH_LEN("definer_host")},
27	- my_offsetof(TABLE_LIST, definer.host),
28	+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
29	FILE_OPTIONS_STRING},
30	{{ C_STRING_WITH_LEN("suid")},
31	- my_offsetof(TABLE_LIST, view_suid),
32	+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
33	FILE_OPTIONS_ULONGLONG},
34	{{ C_STRING_WITH_LEN("with_check_option")},
35	- my_offsetof(TABLE_LIST, with_check),
36	+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
37	FILE_OPTIONS_ULONGLONG},
38	{{ C_STRING_WITH_LEN("timestamp")},
39	- my_offsetof(TABLE_LIST, timestamp),
40	+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
41	FILE_OPTIONS_TIMESTAMP},
42	{{ C_STRING_WITH_LEN("create-version")},
43	- my_offsetof(TABLE_LIST, file_version),
44	+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
45	FILE_OPTIONS_ULONGLONG},
46	{{ C_STRING_WITH_LEN("source")},
47	- my_offsetof(TABLE_LIST, source),
48	+ static_cast<int>(my_offsetof(TABLE_LIST, source)),
49	FILE_OPTIONS_ESTRING},
50	{{(char*) STRING_WITH_LEN("client_cs_name")},
51	- my_offsetof(TABLE_LIST, view_client_cs_name),
52	+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
53	FILE_OPTIONS_STRING},
54	{{(char*) STRING_WITH_LEN("connection_cl_name")},
55	- my_offsetof(TABLE_LIST, view_connection_cl_name),
56	+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
57	FILE_OPTIONS_STRING},
58	{{(char*) STRING_WITH_LEN("view_body_utf8")},
59	- my_offsetof(TABLE_LIST, view_body_utf8),
60	+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
61	FILE_OPTIONS_ESTRING},
62	{{NullS, 0}, 0,
63	FILE_OPTIONS_STRING}