diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2013-01-20 02:23:10 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-01-20 02:23:10 +0000 |
| commit | 283140715be4f86b6cf3aa903736879d07a31051 (patch) | |
| tree | 8acf0cd845fb23ddd409196cf481a2953c66a20f /eclass/mysql-cmake.eclass | |
| parent | Bump, includes upstream security fixes. Many thanks to Brian Evans <grknight@... (diff) | |
| download | gentoo-2-283140715be4f86b6cf3aa903736879d07a31051.tar.gz gentoo-2-283140715be4f86b6cf3aa903736879d07a31051.tar.bz2 gentoo-2-283140715be4f86b6cf3aa903736879d07a31051.zip | |
Sync mysql eclasses from overlay. Includes fix for bug #434552, support for google-mysql, new configurations.
Diffstat (limited to 'eclass/mysql-cmake.eclass')
| -rw-r--r-- | eclass/mysql-cmake.eclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index f634c7fd9585..53f4f7c4eb61 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.11 2013/01/20 02:23:10 robbat2 Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -109,7 +109,8 @@ configure_cmake_minimal() { -DWITH_SSL=system -DWITH_ZLIB=system -DWITHOUT_LIBWRAP=1 - -DWITHOUT_READLINE=1 + -DWITH_READLINE=0 + -DWITH_LIBEDIT=0 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 -DWITHOUT_CSV_STORAGE_ENGINE=1 @@ -133,7 +134,8 @@ configure_cmake_standard() { -DEXTRA_CHARSETS=all -DMYSQL_USER=mysql -DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock - -DWITHOUT_READLINE=1 + -DWITH_READLINE=0 + -DWITH_LIBEDIT=0 -DWITH_ZLIB=system -DWITHOUT_LIBWRAP=1 ) @@ -329,7 +331,8 @@ mysql-cmake_src_install() { # Configuration stuff case ${MYSQL_PV_MAJOR} in - 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;; + 5.[1-4]*) mysql_mycnf_version="5.1" ;; + 5.[5-9]|6*|7*) mysql_mycnf_version="5.5" ;; esac einfo "Building default my.cnf (${mysql_mycnf_version})" insinto "${MY_SYSCONFDIR}" |