Attachment 129509 Details for Bug 173497 – file.diff

[patch] file.diff

file.diff (text/plain), 1.12 KB, created by cheunghonyu on 2012-11-09 12:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cheunghonyu

Created: 2012-11-09 12:40:00 UTC

Size: 1.12 KB

patch

obsolete

>--- Makefile.orig	2012-10-12 21:44:59.000000000 +0800
>+++ Makefile	2012-11-09 20:27:22.000000000 +0800
>@@ -17,10 +17,12 @@
> MAKE_JOBS_SAFE=	yes
> NO_OPTIONS_SORT=yes
> 
>-OPTIONS_DEFINE=	SSL FASTMTX
>+OPTIONS_DEFINE=	SSL FASTMTX UTF8 COMPLEX
> OPTIONS_DEFAULT=SSL
> 
> FASTMTX_DESC=	Replace mutexes with spinlocks
>+UTF8_DESC=	Default charset with UTF8
>+COMPLEX_DESC=	Install extra charset complex
> 
> CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
>@@ -38,7 +40,7 @@
> 		-DINSTALL_SQLBENCHDIR="share/mysql" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
> 		-DWITH_LIBEDIT=0 \
>-		-DWITH_LIBWRAP=1
>+		-DWITH_LIBWRAP=1 
> 
> .ifdef USE_MYSQL
> .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
>@@ -53,6 +55,15 @@
> CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
> .endif
> 
>+.if ${PORT_OPTIONS:MUTF8}
>+CMAKE_ARG+=     -DDEFAULT_CHARSET="utf8"
>+CMAKE_ARG+=     -DDEFAULT_COLLATION="utf8_general_ci"
>+.endif
>+
>+.if ${PORT_OPTIONS:MCOMPLEX}
>+CMAKE_ARG+=     -DWITH_EXTRA_CHARSETS="complex"
>+.endif
>+
> # MySQL-Server part
> .if !defined(CLIENT_ONLY)
> USE_MYSQL=	yes

Actions: View | Diff

Attachments on bug 173497: 129509