Date: Fri, 9 Nov 2012 12:34:27 GMT From: Hon-Yu Lawrence Cheung <cheunghonyu@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/173497: [PATCH] databases/mysql55-server: add two options for multibyte charset mysql user Message-ID: <201211091234.qA9CYRfQ012929@red.freebsd.org> Resent-Message-ID: <201211091240.qA9Ce1FH052214@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173497
>Category: ports
>Synopsis: [PATCH] databases/mysql55-server: add two options for multibyte charset mysql user
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 09 12:40:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Hon-Yu Lawrence Cheung
>Release: FreBSD 9.1-RC3
>Organization:
>Environment:
FreeBSD a5552.honyucheung.net 9.1-RC3 FreeBSD 9.1-RC3 #2 r242544: Sun Nov 4 10:30:38 HKT 2012 root@a5552.honyucheung.net:/usr/obj/usr/src/sys/ACER5552 amd64
>Description:
After using cmake to compile mysql55-server, user cannot pass WITH_CHARSET to alter default charset of mysql55-server. UTF8 may be the first choice for almost multbyte charset mysql user.
This patch adds
1) Default charset to UTF8
2) Add extra charset complex support
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- 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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211091234.qA9CYRfQ012929>