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

Collapse All | Expand All

(-)Makefile (-17 / +11 lines)
Lines 25-36 Link Here
25
SHEBANG_FILES=	scripts/*.sh
25
SHEBANG_FILES=	scripts/*.sh
26
NO_OPTIONS_SORT=yes
26
NO_OPTIONS_SORT=yes
27
27
28
OPTIONS_DEFINE+=	SSL OPENSSL PORTSSL FASTMTX
28
OPTIONS_DEFINE+=	FASTMTX
29
OPTIONS_DEFAULT+=	SSL
29
OPTIONS_RADIO=		SSL
30
OPTIONS_RADIO_SSL=	WITHOUT_SSL BUNDLED_SSL OPENSSL
31
OPTIONS_DEFAULT+=	OPENSSL
30
32
31
FASTMTX_DESC=	Replace mutexes with spinlocks
33
FASTMTX_DESC=	Replace mutexes with spinlocks
32
OPENSSL_DESC=	Use OpenSSL instead of bundled yassl
34
WITHOUT_SSL_DESC=	No SSL/TLS support
33
PORTSSL_DESC=	Use OpenSSL from port (requires OPENSSL to be set)
35
BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
34
36
35
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
37
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
36
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
38
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
Lines 77-102 Link Here
77
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
79
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
78
.endif
80
.endif
79
81
80
.if ${PORT_OPTIONS:MSSL}
82
81
.if exists(${LOCALBASE}/include/openssl/opensslv.h)
82
.  if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL}
83
IGNORE=	security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl
84
.  endif
85
.endif
86
.if ${PORT_OPTIONS:MOPENSSL}
83
.if ${PORT_OPTIONS:MOPENSSL}
87
USE_OPENSSL=	yes
84
USE_OPENSSL=	yes
88
.if !${PORT_OPTIONS:MPORTSSL}
89
WITH_OPENSSL_BASE=	yes
90
.else
91
WITH_OPENSSL_PORT=	yes
92
.endif
93
CMAKE_ARGS+=	-DWITH_SSL=yes
85
CMAKE_ARGS+=	-DWITH_SSL=yes
94
.else
86
.elif ${PORT_OPTIONS:MBUNDLED_SSL}
95
CMAKE_ARGS+=	-DWITH_SSL=bundled
87
CMAKE_ARGS+=	-DWITH_SSL=bundled
96
.endif
88
.elif ${PORT_OPTIONS:MWITHOUT_SSL}
89
CMAKE_FLAGS+=	-DWITH_SSL=no
97
.else
90
.else
98
CMAKE_FLAGS+=	-DWITH_SSL=no
91
CMAKE_FLAGS+=	-DWITH_SSL=no
99
.endif
92
.endif
93
100
.if ${PORT_OPTIONS:MFASTMTX}
94
.if ${PORT_OPTIONS:MFASTMTX}
101
CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
95
CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
102
.endif
96
.endif

Return to bug 196125