View | Details | Raw Unified | Return to bug 196122 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-18 / +12 lines)
Lines 26-38 Link Here
26
26
27
BROKEN_arm=	Does not compile on arm
27
BROKEN_arm=	Does not compile on arm
28
28
29
OPTIONS_DEFINE=		INNODB SSL OPENSSL PORTSSL FASTMTX
29
OPTIONS_DEFINE=		FASTMTX
30
OPTIONS_DEFAULT=	SSL
30
OPTIONS_RADIO=		SSL
31
OPTIONS_RADIO_SSL=	WITHOUT_SSL BUNDLED_SSL OPENSSL
32
OPTIONS_DEFAULT+=	OPENSSL
31
NO_OPTIONS_SORT=	yes
33
NO_OPTIONS_SORT=	yes
32
34
33
FASTMTX_DESC=		Replace mutexes with spinlocks
35
FASTMTX_DESC=		Replace mutexes with spinlocks
34
OPENSSL_DESC=		Use OpenSSL instead of bundled yassl
36
WITHOUT_SSL_DESC=	No SSL/TLS support
35
PORTSSL_DESC=		Use OpenSSL from port (requires OPENSSL to be set)
37
BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
36
38
37
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
39
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
38
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
40
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
Lines 81-105 Link Here
81
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
83
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
82
.endif
84
.endif
83
85
84
.if ${PORT_OPTIONS:MSSL}
86
.if ${PORT_OPTIONS:MWITHOUT_SSL}
85
.  if exists(${LOCALBASE}/include/openssl/opensslv.h)
87
CMAKE_FLAGS+=   -DWITH_SSL=no
86
.    if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL}
88
.else
87
IGNORE=	security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl
88
.    endif
89
.  endif
90
.  if ${PORT_OPTIONS:MOPENSSL}
89
.  if ${PORT_OPTIONS:MOPENSSL}
91
USE_OPENSSL=	yes
90
USE_OPENSSL=	yes
92
.    if !${PORT_OPTIONS:MPORTSSL}
93
WITH_OPENSSL_BASE=	yes
94
.    else
95
WITH_OPENSSL_PORT=	yes
96
.    endif
97
CMAKE_ARGS+=	-DWITH_SSL=yes
91
CMAKE_ARGS+=	-DWITH_SSL=yes
98
.  else
92
.  else
99
CMAKE_ARGS+=	-DWITH_SSL=bundled
93
CMAKE_ARGS+=	-DWITH_SSL=bundled
100
.  endif
94
.  endif
101
.else
102
CMAKE_FLAGS+=	-DWITH_SSL=no
103
.endif
95
.endif
104
96
105
.if ${PORT_OPTIONS:MFASTMTX}
97
.if ${PORT_OPTIONS:MFASTMTX}
Lines 112-118 Link Here
112
.else
104
.else
113
# MySQL-Server part
105
# MySQL-Server part
114
106
115
CONFLICTS_INSTALL=	mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
107
CONFLICTS_INSTALL=	mysql*-server-* \
108
			mariadb[0-9][0-9]-server-* \
109
			percona*-server-*
116
110
117
USE_MYSQL=	yes
111
USE_MYSQL=	yes
118
WANT_MYSQL_VER=	100m
112
WANT_MYSQL_VER=	100m

Return to bug 196122