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

(-)Makefile (-2 / +13 lines)
Lines 17-26 Link Here
17
MAKE_JOBS_SAFE=	yes
17
MAKE_JOBS_SAFE=	yes
18
NO_OPTIONS_SORT=yes
18
NO_OPTIONS_SORT=yes
19
19
20
OPTIONS_DEFINE=	SSL FASTMTX
20
OPTIONS_DEFINE=	SSL FASTMTX UTF8 COMPLEX
21
OPTIONS_DEFAULT=SSL
21
OPTIONS_DEFAULT=SSL
22
22
23
FASTMTX_DESC=	Replace mutexes with spinlocks
23
FASTMTX_DESC=	Replace mutexes with spinlocks
24
UTF8_DESC=	Default charset with UTF8
25
COMPLEX_DESC=	Install extra charset complex
24
26
25
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
27
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
26
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
28
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
Lines 38-44 Link Here
38
		-DINSTALL_SQLBENCHDIR="share/mysql" \
40
		-DINSTALL_SQLBENCHDIR="share/mysql" \
39
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
41
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
40
		-DWITH_LIBEDIT=0 \
42
		-DWITH_LIBEDIT=0 \
41
		-DWITH_LIBWRAP=1
43
		-DWITH_LIBWRAP=1 
42
44
43
.ifdef USE_MYSQL
45
.ifdef USE_MYSQL
44
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
46
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
Lines 53-58 Link Here
53
CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
55
CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
54
.endif
56
.endif
55
57
58
.if ${PORT_OPTIONS:MUTF8}
59
CMAKE_ARG+=     -DDEFAULT_CHARSET="utf8"
60
CMAKE_ARG+=     -DDEFAULT_COLLATION="utf8_general_ci"
61
.endif
62
63
.if ${PORT_OPTIONS:MCOMPLEX}
64
CMAKE_ARG+=     -DWITH_EXTRA_CHARSETS="complex"
65
.endif
66
56
# MySQL-Server part
67
# MySQL-Server part
57
.if !defined(CLIENT_ONLY)
68
.if !defined(CLIENT_ONLY)
58
USE_MYSQL=	yes
69
USE_MYSQL=	yes

Return to bug 173497