grknight 15/01/28 13:48:58 Modified: ChangeLog mysql-cmake.eclass mysql-multilib.eclass Log: Sync changes from mysql overlay
Revision Changes Path 1.1516 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1516&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1516&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1515&r2=1.1516 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1515 retrieving revision 1.1516 diff -u -r1.1515 -r1.1516 --- ChangeLog 23 Jan 2015 22:48:10 -0000 1.1515 +++ ChangeLog 28 Jan 2015 13:48:58 -0000 1.1516 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1515 2015/01/23 22:48:10 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1516 2015/01/28 13:48:58 grknight Exp $ + + 28 Jan 2015; Brian Evans <grkni...@gentoo.org> mysql-multilib.eclass, + mysql-cmake.eclass: + Sync from mysql overlay 23 Jan 2015; Patrice Clement <monsie...@gentoo.org> java-ant-2.eclass: Sanitise find arguments when using JAVA_PKG_BSFIX_NAME option. Fix #231956. 1.27 eclass/mysql-cmake.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.27&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.27&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.26&r2=1.27 Index: mysql-cmake.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mysql-cmake.eclass 26 Nov 2014 00:34:41 -0000 1.26 +++ mysql-cmake.eclass 28 Jan 2015 13:48:58 -0000 1.27 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.26 2014/11/26 00:34:41 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.27 2015/01/28 13:48:58 grknight Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -232,6 +232,10 @@ mycmakeargs+=( $(cmake-utils_use_with innodb-lz4 INNODB_LZ4) $(cmake-utils_use_with innodb-lzo INNODB_LZO) ) fi + + if mysql_version_is_at_least "10.1.2" ; then + mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) ) + fi else mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) fi 1.12 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.11&r2=1.12 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mysql-multilib.eclass 26 Nov 2014 00:34:41 -0000 1.11 +++ mysql-multilib.eclass 28 Jan 2015 13:48:58 -0000 1.12 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.11 2014/11/26 00:34:41 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.12 2015/01/28 13:48:58 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -184,21 +184,31 @@ LICENSE="GPL-2" SLOT="0" -IUSE="+community cluster debug embedded extraengine jemalloc latin1 max-idx-128 minimal +IUSE="+community cluster debug embedded extraengine jemalloc latin1 minimal +perl profiling selinux ssl systemtap static static-libs tcmalloc test" +### Begin readline/libedit +### If the world was perfect, we would use external libedit on both to have a similar experience +### However libedit does not seem to support UTF-8 keyboard input + # This probably could be simplified, but the syntax would have to be just right -if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ - mysql_check_version_range "5.5.37 to 10.0.13.99" ; then - IUSE="bindist ${IUSE}" -elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ - mysql_check_version_range "5.5.37 to 5.6.11.99" ; then - IUSE="bindist ${IUSE}" -elif [[ ${PN} == "mysql-cluster" ]] && \ - mysql_check_version_range "7.2 to 7.2.99.99" ; then +#if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ +# mysql_check_version_range "5.5.37 to 10.0.13.99" ; then +# IUSE="bindist ${IUSE}" +#elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ +# mysql_check_version_range "5.5.37 to 5.6.11.99" ; then +# IUSE="bindist ${IUSE}" +#elif [[ ${PN} == "mysql-cluster" ]] && \ +# mysql_check_version_range "7.2 to 7.2.99.99" ; then +# IUSE="bindist ${IUSE}" +#fi + +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then IUSE="bindist ${IUSE}" fi +### End readline/libedit + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then IUSE="${IUSE} oqgraph pam sphinx tokudb" # 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers @@ -209,6 +219,9 @@ # MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries # Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo" + + # 10.1.2 introduces a cracklib password checker + mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} cracklib" fi if [[ -n "${WSREP_REVISION}" ]]; then @@ -250,21 +263,31 @@ systemtap? ( >=dev-util/systemtap-1.3:0= ) " +### Begin readline/libedit +### If the world was perfect, we would use external libedit on both to have a similar experience +### However libedit does not seem to support UTF-8 keyboard input + # dev-db/mysql-5.6.12+ only works with dev-libs/libedit # mariadb 10.0.14 fixes libedit detection. changed to follow mysql # This probably could be simplified -if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ - mysql_version_is_at_least "5.6.12" ; then - DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" -elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then - DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" -elif [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ - mysql_version_is_at_least "10.0.14" ; then - DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" -else +#if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ +# mysql_version_is_at_least "5.6.12" ; then +# DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" +#elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then +# DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" +#elif [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ +# mysql_version_is_at_least "10.0.14" ; then +# DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" +#else +# DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" +#fi + +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" fi +### End readline/libedit + if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} >=dev-libs/boost-1.56.0:0=" fi @@ -288,6 +311,8 @@ innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) " + + mysql_version_is_at_least "10.1.2" && DEPEND="${DEPEND} cracklib? ( sys-libs/cracklib:0= )" fi [[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )" @@ -514,7 +539,8 @@ ) fi - mycmakeargs+=( -DWITH_EDITLINE=system ) + ### TODO: make this system but issues with UTF-8 prevent it + mycmakeargs+=( -DWITH_EDITLINE=bundled ) if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mycmakeargs+=(
