Date: Wednesday, December 22, 2010 @ 14:11:32 Author: andrea Revision: 103758
upgpkg: mysql 5.5.8-4 CMake options does not needed the prefix; patch to fix the default charset Added: mysql/trunk/fix-set-default-charset.patch Modified: mysql/trunk/PKGBUILD -------------------------------+ PKGBUILD | 35 ++++++++++++++----------- fix-set-default-charset.patch | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-12-22 17:34:56 UTC (rev 103757) +++ PKGBUILD 2010-12-22 19:11:32 UTC (rev 103758) @@ -6,7 +6,7 @@ pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.8 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="http://www.mysql.com/" @@ -14,12 +14,17 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' - 'my.cnf') + 'my.cnf' + 'fix-set-default-charset.patch') md5sums=('42e866302b61f5e213afd33e04677017' '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6') + '1c949c0dbea5206af0db14942d9927b6' + '6f72b482580d020933ea9a7a4f638051') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -Np1 -i ${srcdir}/fix-set-default-charset.patch + cd "${srcdir}" mkdir build cd build @@ -33,14 +38,14 @@ -DCMAKE_INSTALL_PREFIX=/usr \ -DMYSQL_DATADIR=/var/lib/mysql \ -DSYSCONFDIR=/etc/mysql \ - -DINSTALL_INFODIR=/usr/share/mysql/docs \ - -DINSTALL_MANDIR=/usr/share/man \ + -DINSTALL_INFODIR=share/mysql/docs \ + -DINSTALL_MANDIR=share/man \ -DINSTALL_PLUGINDIR=share/mysql/lib/plugin \ - -DINSTALL_SCRIPTDIR=/usr/bin \ - -DINSTALL_DOCREADMEDIR=/usr/share/mysql \ - -DINSTALL_SUPPORTFILESDIR=/usr/share/mysql \ - -DINSTALL_MYSQLSHAREDIR=/usr/share/mysql \ - -DINSTALL_SHAREDIR=/usr/share/mysql \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_DOCREADMEDIR=share/mysql \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_SHAREDIR=share/mysql \ -DWITH_READLINE=OFF \ -DWITH_SSL=system \ -DWITH_LIBWRAP=ON \ @@ -51,11 +56,11 @@ -DMYSQL_TCP_PORT=3306 \ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ -DENABLED_LOCAL_INFILE=ON \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITH_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITH_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITH_FEDERATED_STORAGE_ENGINE=1 \ + -DWITHOUT_PARTITION_STORAGE_ENGINE=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ -DWITH_INNOBASE_STORAGE_ENGINE=1 make Added: fix-set-default-charset.patch =================================================================== --- fix-set-default-charset.patch (rev 0) +++ fix-set-default-charset.patch 2010-12-22 19:11:32 UTC (rev 103758) @@ -0,0 +1,55 @@ +--- a/cmake/character_sets.cmake 2010-02-25 08:15:46 +0000 ++++ b/cmake/character_sets.cmake 2010-12-22 09:23:08 +0000 +@@ -1,4 +1,4 @@ +-# Copyright (C) 2009 Sun Microsystems, Inc ++# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -13,17 +13,19 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +-#Charsets and collations ++# Charsets and collations + IF(NOT DEFAULT_CHARSET) +-SET(DEFAULT_CHARSET "latin1") ++ SET(DEFAULT_CHARSET "latin1") + ENDIF() + +-IF(NOT DEFAULT_COLLATIONS) +-SET(DEFAULT_COLLATION "latin1_swedish_ci") ++IF(NOT DEFAULT_COLLATION) ++ SET(DEFAULT_COLLATION "latin1_swedish_ci") + ENDIF() + + SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8 utf8mb4) +-SET(CHARSETS_COMPLEX big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32) ++SET(CHARSETS_COMPLEX ++ big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 ++ sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32) + + SET(CHARSETS_AVAILABLE + binary armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257 + +=== modified file 'config.h.cmake' +--- a/config.h.cmake 2010-12-21 12:00:26 +0000 ++++ b/config.h.cmake 2010-12-22 09:23:08 +0000 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2009 Sun Microsystems, Inc ++/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -518,8 +518,8 @@ + #cmakedefine CYBOZU 1 + + /* Character sets and collations */ +-#cmakedefine MYSQL_DEFAULT_CHARSET_NAME "latin1" +-#cmakedefine MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" ++#cmakedefine MYSQL_DEFAULT_CHARSET_NAME "@MYSQL_DEFAULT_CHARSET_NAME@" ++#cmakedefine MYSQL_DEFAULT_COLLATION_NAME "@MYSQL_DEFAULT_COLLATION_NAME@" + + #cmakedefine USE_MB 1 + #cmakedefine USE_MB_IDENT 1 +