Attachment #184548 for bug #220865




# $FreeBSD$

PORTNAME=	mysql
PORTREVISION=	1
PKGNAMESUFFIX=	57-client

COMMENT=	Multithreaded SQL database (client)


CLIENT_ONLY=	yes

OPTIONS_GROUP+=		PLUGINS
OPTIONS_GROUP_PLUGINS=	SASLCLIENT
OPTIONS_SUB=		YES
PLUGINS_DESC=		Default Client Plugins
SASLCLIENT_DESC=	SASL client plugin module
OPTIONS_DEFAULT+=	SASLCLIENT
SASLCLIENT_CMAKE_ON=	-DWITH_AUTHENTICATION_LDAP=1
SASLCLIENT_CMAKE_OFF=	-DWITH_AUTHENTICATION_LDAP=0

# issue 220865: MySQL developers forgot that FreeBSD != Linux
post-patch-SASLCLIENT-on:
	@${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \
	    ${WRKSRC}/cmake/plugin.cmake

# issue 166367: adding symlinks for back-compatibility with ${lib}_r
post-install:
	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a




--- cmake/plugin.cmake.orig	2017-07-20 10:40:31 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)

Lines 125-130 Link Here

(-)databases/mysql57-client/pkg-plist (+2 lines)
125	lib/mysql/libmysqlclient_r.a	125	lib/mysql/libmysqlclient_r.a
126	lib/mysql/libmysqlclient_r.so	126	lib/mysql/libmysqlclient_r.so
127	lib/mysql/libmysqlclient_r.so.20	127	lib/mysql/libmysqlclient_r.so.20
		128	%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
		129	%%SASLCLIENT%%@dir lib/mysql/plugin/debug
128	libdata/pkgconfig/mysqlclient.pc	130	libdata/pkgconfig/mysqlclient.pc
129	man/man1/comp_err.1.gz	131	man/man1/comp_err.1.gz
130	man/man1/mysql.1.gz	132	man/man1/mysql.1.gz

Return to bug 220865

Lines 2-7 Link Here

(-)databases/mysql57-client/Makefile (+15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
		5	PORTREVISION= 1
5	PKGNAMESUFFIX= 57-client	6	PKGNAMESUFFIX= 57-client
6		7
7	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)
Lines 33-38 Link Here
33		34
34	CLIENT_ONLY= yes	35	CLIENT_ONLY= yes
35		36
		37	OPTIONS_GROUP+= PLUGINS
		38	OPTIONS_GROUP_PLUGINS= SASLCLIENT
		39	OPTIONS_SUB= YES
		40	PLUGINS_DESC= Default Client Plugins
		41	SASLCLIENT_DESC= SASL client plugin module
		42	OPTIONS_DEFAULT+= SASLCLIENT
		43	SASLCLIENT_CMAKE_ON= -DWITH_AUTHENTICATION_LDAP=1
		44	SASLCLIENT_CMAKE_OFF= -DWITH_AUTHENTICATION_LDAP=0
		45
		46	# issue 220865: MySQL developers forgot that FreeBSD != Linux
		47	post-patch-SASLCLIENT-on:
		48	@${REINPLACE_CMD} -e 's\|%%FREEBSD_LOCAL_LIB%%\|${LOCALBASE}/lib\|g' \
		49	${WRKSRC}/cmake/plugin.cmake
		50
36	# issue 166367: adding symlinks for back-compatibility with ${lib}_r	51	# issue 166367: adding symlinks for back-compatibility with ${lib}_r
37	post-install:	52	post-install:
38	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a	53	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a

Added Link Here

(-)databases/mysql57-client/files/patch-cmake_plugin.cmake (+20 lines)
1	--- cmake/plugin.cmake.orig 2017-07-20 10:40:31 UTC
2	+++ cmake/plugin.cmake
3	@@ -219,9 +219,16 @@ 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)