diff options
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/mysql-autotools.eclass | 34 | ||||
| -rw-r--r-- | eclass/mysql-cmake.eclass | 26 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 863 | ||||
| -rw-r--r-- | eclass/mysql-v2.eclass | 31 | ||||
| -rw-r--r-- | eclass/mysql.eclass | 8 | ||||
| -rw-r--r-- | eclass/mysql_fx.eclass | 4 |
7 files changed, 938 insertions, 35 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index bdcfca75fea4..ca09cda4a1c6 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1330 2014/07/29 16:42:59 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1331 2014/07/29 17:59:21 robbat2 Exp $ + + 29 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> +mysql-multilib.eclass, + mysql.eclass, mysql-autotools.eclass, mysql-cmake.eclass, mysql-v2.eclass, + mysql_fx.eclass: + Sync mysql eclass from overlay. 28 Jul 2014; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass: Set also QMAKE_LINK_{C_,}SHLIB diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index 692790072d16..e9849382f0aa 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -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-autotools.eclass,v 1.19 2014/07/19 10:18:41 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.20 2014/07/29 17:59:21 robbat2 Exp $ # @ECLASS: mysql-autotools.eclass # @MAINTAINER: @@ -377,23 +377,29 @@ mysql-autotools_src_prepare() { cd "${S}" - # Apply the patches for this MySQL version - EPATCH_SUFFIX="patch" - mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" - # Clean out old items - rm -f "${EPATCH_SOURCE}"/* - # Now link in right patches - mysql_mv_patches - # And apply - epatch + if [[ ${MY_EXTRAS_VER} != none ]]; then + + # Apply the patches for this MySQL version + EPATCH_SUFFIX="patch" + mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" + # Clean out old items + rm -f "${EPATCH_SOURCE}"/* + # Now link in right patches + mysql_mv_patches + # And apply + epatch + fi # last -fPIC fixup, per bug #305873 i="${S}"/storage/innodb_plugin/plug.in [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" - # Additional checks, remove bundled zlib - rm -f "${S}/zlib/"*.[ch] - sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" + # Additional checks, remove bundled zlib (Cluster needs this, for static + # memory management in zlib, leave available for Cluster) + if [[ "${PN}" != "mysql-cluster" ]] ; then + rm -f "${S}/zlib/"*.[ch] + sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" + fi rm -f "scripts/mysqlbug" # Make charsets install in the right place @@ -606,7 +612,7 @@ mysql-autotools_src_install() { -e "s!= /var!= ${EPREFIX}/var!" \ "${FILESDIR}/${mycnf_src}" \ > "${TMPDIR}/my.cnf.ok" - use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok" + use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" if use latin1 ; then sed -i \ -e "/character-set/s|utf8|latin1|g" \ diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 25012d13a1bd..8360ded4a422 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -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.22 2014/07/19 10:18:41 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.23 2014/07/29 17:59:21 robbat2 Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -76,9 +76,9 @@ mysql-cmake_disable_test() { mysql-cmake_use_plugin() { [[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>" if use_if_iuse $1 ; then - echo "-DWITH_$2=1" + echo "-DWITH_$2=1 -DPLUGIN_$2=YES" else - echo "-DWITHOUT_$2=1 -DWITH_$2=0" + echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO" fi } @@ -129,7 +129,15 @@ configure_cmake_minimal() { -DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1 -DWITHOUT_MYISAM_STORAGE_ENGINE=1 -DWITHOUT_PARTITION_STORAGE_ENGINE=1 - -DWITHOUT_INNOBASE_STORAGE_ENGINE=1 + -DPLUGIN_ARCHIVE=NO + -DPLUGIN_BLACKHOLE=NO + -DPLUGIN_CSV=NO + -DPLUGIN_FEDERATED=NO + -DPLUGIN_HEAP=NO + -DPLUGIN_INNOBASE=NO + -DPLUGIN_MYISAMMRG=NO + -DPLUGIN_MYISAM=NO + -DPLUGIN_PARTITION=NO ) } @@ -191,10 +199,12 @@ configure_cmake_standard() { # CassandraSE needs Apache Thrift which is not in portage mycmakeargs+=( -DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0 + -DPLUGIN_CASSANDRA=NO $(mysql-cmake_use_plugin extraengine SEQUENCE) $(mysql-cmake_use_plugin extraengine SPIDER) $(mysql-cmake_use_plugin extraengine CONNECT) -DCONNECT_WITH_MYSQL=1 + -DPLUGIN_CONNECT_WITH_MYSQL=YES $(cmake-utils_use xml CONNECT_WITH_LIBXML2) $(cmake-utils_use odbc CONNECT_WITH_ODBC) ) @@ -309,9 +319,7 @@ mysql-cmake_src_configure() { -DWITH_SSL=$(usex ssl system bundled) ) - if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then - mycmakeargs+=( -DWITH_EDITLINE=system ) - else + if in_iuse bindist ; then mycmakeargs+=( -DWITH_READLINE=$(usex bindist 1 0) -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) @@ -319,6 +327,8 @@ mysql-cmake_src_configure() { ) fi + mycmakeargs+=( -DWITH_EDITLINE=system ) + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mycmakeargs+=( -DWITH_JEMALLOC=$(usex jemalloc system) @@ -411,7 +421,7 @@ mysql-cmake_src_install() { sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ "${FILESDIR}/${mycnf_src}" \ > "${TMPDIR}/my.cnf.ok" || die - use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok" + use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" if use latin1 ; then sed -i \ -e "/character-set/s|utf8|latin1|g" \ diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass new file mode 100644 index 000000000000..439b4d7f8a13 --- /dev/null +++ b/eclass/mysql-multilib.eclass @@ -0,0 +1,863 @@ +# 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.1 2014/07/29 17:59:21 robbat2 Exp $ + +# @ECLASS: mysql-multilib.eclass +# @MAINTAINER: +# Maintainers: +# - MySQL Team <mysql-bugs@gentoo.org> +# - Robin H. Johnson <robbat2@gentoo.org> +# - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +# @BLURB: This eclass provides most of the functions for mysql ebuilds +# @DESCRIPTION: +# The mysql-multilib.eclass is the base eclass to build the mysql and +# alternative projects (mariadb and percona) ebuilds. +# This eclass uses the mysql-cmake eclass for the +# specific bits related to the build system. +# It provides the src_unpack, src_prepare, src_configure, src_compile, +# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm +# phase hooks. + +MYSQL_EXTRAS="" + +# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER +# @DESCRIPTION: +# The version of the MYSQL_EXTRAS repo to use to build mysql +# Use "none" to disable it's use +[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2" + +inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \ + toolchain-funcs user cmake-utils multilib-minimal + +# +# Supported EAPI versions and export functions +# + +case "${EAPI:-0}" in + 5) ;; + *) die "Unsupported EAPI: ${EAPI}" ;; +esac + +EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config + +# +# VARIABLES: +# + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" +if [[ ${MY_EXTRAS_VER} == "live" ]]; then + EGIT_PROJECT=mysql-extras + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" + RESTRICT="userpriv" +fi + +# @ECLASS-VARIABLE: MYSQL_PV_MAJOR +# @DESCRIPTION: +# Upstream MySQL considers the first two parts of the version number to be the +# major version. Upgrades that change major version should always run +# mysql_upgrade. +MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" + +# Cluster is a special case... +if [[ "${PN}" == "mysql-cluster" ]]; then + case $PV in + 7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;; + esac +fi + +# MariaDB has left the numbering schema but keeping compatibility +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + case ${PV} in + 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;; + esac +fi + +# @ECLASS-VARIABLE: MYSQL_VERSION_ID +# @DESCRIPTION: +# MYSQL_VERSION_ID will be: +# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] +# This is an important part, because many of the choices the MySQL ebuild will do +# depend on this variable. +# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" +# We also strip off upstream's trailing letter that they use to respin tarballs +MYSQL_VERSION_ID="" +tpv="${PV%[a-z]}" +tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" +for vatom in 0 1 2 3 ; do + # pad to length 2 + tpv[${vatom}]="00${tpv[${vatom}]}" + MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" +done +# strip leading "0" (otherwise it's considered an octal number by BASH) +MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} + +# This eclass should only be used with at least mysql-5.5.35 +mysql_version_is_at_least "5.5.35" || die "This eclass should only be used with >=mysql-5.5.35" + +# @ECLASS-VARIABLE: XTRADB_VER +# @DEFAULT_UNSET +# @DESCRIPTION: +# Version of the XTRADB storage engine + +# @ECLASS-VARIABLE: PERCONA_VER +# @DEFAULT_UNSET +# @DESCRIPTION: +# Designation by PERCONA for a MySQL version to apply an XTRADB release + +# Work out the default SERVER_URI correctly +if [[ -z ${SERVER_URI} ]]; then + [[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}" + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + # Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names + mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \ + MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV}) + MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" + SERVER_URI=" + http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz + http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + " + if [[ ${PN} == "mariadb-galera" ]]; then + MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}" + fi + elif [[ ${PN} == "percona-server" ]]; then + PERCONA_PN="Percona-Server" + MIRROR_PV=$(get_version_component_range 1-2 ${PV}) + MY_PV=$(get_version_component_range 1-3 ${PV}) + PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV}) + PERCONA_RC=$(get_version_component_range 6 ${PV}) + SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz" +# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-rel30.2.tar.gz +# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz + else + if [[ "${PN}" == "mysql-cluster" ]] ; then + URI_DIR="MySQL-Cluster" + URI_FILE="mysql-cluster-gpl" + else + URI_DIR="MySQL" + URI_FILE="mysql" + fi + URI_A="${URI_FILE}-${MY_PV}.tar.gz" + MIRROR_PV=$(get_version_component_range 1-2 ${PV}) + # Recently upstream switched to an archive site, and not on mirrors + SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A} + mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}" + fi +fi + +# Define correct SRC_URIs +SRC_URI="${SERVER_URI}" + +# Gentoo patches to MySQL +if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then + SRC_URI="${SRC_URI} + mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" +fi + +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" +HOMEPAGE="http://www.mysql.com/" +if [[ ${PN} == "mariadb" ]]; then + HOMEPAGE="http://mariadb.org/" + DESCRIPTION="An enhanced, drop-in replacement for MySQL" +fi +if [[ ${PN} == "mariadb-galera" ]]; then + HOMEPAGE="http://mariadb.org/" + DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication" +fi +if [[ ${PN} == "percona-server" ]]; then + HOMEPAGE="http://www.percona.com/software/percona-server" + DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team" +fi +LICENSE="GPL-2" +SLOT="0" + +IUSE="+community cluster debug embedded extraengine jemalloc latin1 max-idx-128 minimal + +perl profiling selinux ssl systemtap static static-libs tcmalloc test" + +# This probably could be simplified, but the syntax would have to be just right +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; 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="${IUSE} oqgraph pam sphinx tokudb" + # 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers + mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \ + REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )" + REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" +fi + +if [[ ${PN} == "percona-server" ]]; then + IUSE="${IUSE} pam" +fi + +REQUIRED_USE=" + ${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) + minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" + +# +# DEPENDENCIES: +# + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +# MULTILIB_USEDEP only set for libraries used by the client library +DEPEND=" + ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) + kernel_linux? ( + sys-process/procps:0= + dev-libs/libaio:0= + ) + >=sys-apps/sed-4 + >=sys-apps/texinfo-4.7-r1 + >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] + !dev-db/mariadb-native-client[mysqlcompat] + jemalloc? ( dev-libs/jemalloc:0=[${MULTILIB_USEDEP}] ) + tcmalloc? ( dev-util/google-perftools:0= ) + systemtap? ( >=dev-util/systemtap-1.3:0= ) +" + +# dev-db/mysql-5.6.12+ only works with dev-libs/libedit +# 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" +elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then + DEPEND="${DEPEND} dev-libs/libedit" +else + DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" +fi + +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + # Bug 441700 MariaDB >=5.3 include custom mytop + DEPEND="${DEPEND} + oqgraph? ( >=dev-libs/boost-1.40.0:0= ) + !minimal? ( pam? ( virtual/pam:0= ) ) + perl? ( !dev-db/mytop )" + if mysql_version_is_at_least "10.0.5" ; then + DEPEND="${DEPEND} + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + " + fi + mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" + if mysql_version_is_at_least "10.0.9" ; then + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" + fi +fi + +# Having different flavours at the same time is not a good idea +for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do + [[ ${i} == ${PN} ]] || + DEPEND="${DEPEND} !dev-db/${i}" +done + +if [[ ${PN} == "mysql-cluster" ]] ; then + # TODO: This really should include net-misc/memcached + # but the package does not install the files it seeks. + mysql_version_is_at_least "7.2.3" && \ + DEPEND="${DEPEND} dev-libs/libevent:0=" +fi + +# prefix: first need to implement something for #196294 +# TODO: check emul-linux-x86-db dep when it is multilib enabled +RDEPEND="${DEPEND} + !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) + selinux? ( sec-policy/selinux-mysql ) + abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) +" + +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + # Bug 455016 Add dependencies of mytop + RDEPEND="${RDEPEND} perl? ( + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes ) " +fi + +if [[ ${PN} == "mariadb-galera" ]] ; then + # The wsrep API version must match between the ebuild and sys-cluster/galera. + # This will be indicated by WSREP_REVISION in the ebuild and the first number + # in the version of sys-cluster/galera + RDEPEND="${RDEPEND} + =sys-cluster/galera-${WSREP_REVISION}* + " +fi + +if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \ + DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )" +fi + +# compile-time-only +DEPEND="${DEPEND} + virtual/yacc + static? ( sys-libs/ncurses[static-libs] ) + >=dev-util/cmake-2.8.9 +" + +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) + ~virtual/mysql-${MYSQL_PV_MAJOR}" + +# my_config.h includes ABI specific data +MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) + +# +# HELPER FUNCTIONS: +# + +# @FUNCTION: mysql-multilib_disable_test +# @DESCRIPTION: +# Helper function to disable specific tests. +mysql-multilib_disable_test() { + mysql-cmake_disable_test "$@" +} + +# +# EBUILD FUNCTIONS +# + +# @FUNCTION: mysql-multilib_pkg_setup +# @DESCRIPTION: +# Perform some basic tests and tasks during pkg_setup phase: +# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" +# create new user and group for mysql +# warn about deprecated features +mysql-multilib_pkg_setup() { + + if has test ${FEATURES} ; then + if ! use minimal ; then + if ! has userpriv ${FEATURES} ; then + eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + fi + fi + + # This should come after all of the die statements + enewgroup mysql 60 || die "problem adding 'mysql' group" + enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" + + if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then + ewarn "Upstream has noted that the NDB cluster support in the 5.0 and" + ewarn "5.1 series should NOT be put into production. In the near" + ewarn "future, it will be disabled from building." + fi + + if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup + fi + + if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then + eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + +} + +# @FUNCTION: mysql-multilib_src_unpack +# @DESCRIPTION: +# Unpack the source code +mysql-multilib_src_unpack() { + + # Initialize the proper variables first + mysql_init_vars + + unpack ${A} + # Grab the patches + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack + + mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" +} + +# @FUNCTION: mysql-multilib_src_prepare +# @DESCRIPTION: +# Apply patches to the source code and remove unneeded bundled libs. +mysql-multilib_src_prepare() { + mysql-cmake_src_prepare "$@" + if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare + fi +} + + +# @FUNCTION: mysql-multilib_src_configure +# @DESCRIPTION: +# Configure mysql to build the code for Gentoo respecting the use flags. +mysql-multilib_src_configure() { + multilib-minimal_src_configure +} + +multilib_src_configure() { + + debug-print-function ${FUNCNAME} "$@" + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" + -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr + -DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql + -DSYSCONFDIR=${EPREFIX}/etc/mysql + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${P} + -DINSTALL_DOCREADMEDIR=share/doc/${P} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_ELIBDIR=$(get_libdir)/mysql + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql + -DINSTALL_MYSQLSHAREDIR=share/mysql + -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test + -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin + -DINSTALL_SBINDIR=sbin + -DINSTALL_SCRIPTDIR=share/mysql/scripts + -DINSTALL_SQLBENCHDIR=share/mysql + -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql + -DWITH_COMMENT="Gentoo Linux ${PF}" + $(cmake-utils_use_with test UNIT_TESTS) + -DWITH_LIBEDIT=0 + -DWITH_ZLIB=system + -DWITHOUT_LIBWRAP=1 + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock + -DWITH_SSL=$(usex ssl system bundled) + ) + + if in_iuse bindist ; then + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + $(usex bindist -DHAVE_BFD_H=0 '') + ) + fi + + mycmakeargs+=( -DWITH_EDITLINE=system ) + + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + mycmakeargs+=( + -DWITH_JEMALLOC=$(usex jemalloc system) + ) + + mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system ) + fi + + configure_cmake_locale + + if multilib_is_native_abi && ! use minimal ; then + configure_cmake_standard + else + configure_cmake_minimal + fi + + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" + # Causes linkage failures. Upstream bug #59607 removes it + if ! mysql_version_is_at_least "5.6" ; then + CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" + fi + # As of 5.7, exceptions are used! + if ! mysql_version_is_at_least "5.7" ; then + CXXFLAGS="${CXXFLAGS} -fno-exceptions" + fi + export CXXFLAGS + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + cmake-utils_src_configure +} + +mysql-multilib_src_compile() { + local _cmake_args=( "${@}" ) + + multilib-minimal_src_compile +} + +multilib_src_compile() { + cmake-utils_src_compile "${_cmake_args[@]}" +} + + +# @FUNCTION: mysql-multilib_src_install +# @DESCRIPTION: +# Install mysql. +mysql-multilib_src_install() { + multilib-minimal_src_install +} + +multilib_src_install() { + debug-print-function ${FUNCNAME} "$@" + + if multilib_is_native_abi; then + mysql-cmake_src_install + else + cmake-utils_src_install + if ! use minimal && [[ "${PN}" == "mariadb" || "${PN}" == "mariadb-galera" ]] ; then + insinto /usr/include/mysql/private + doins "${S}"/sql/*.h + fi + fi +} + +# @FUNCTION: mysql-multilib_pkg_preinst +# @DESCRIPTION: +# Call java-pkg-opt-2 eclass when mysql-cluster is installed +mysql-multilib_pkg_preinst() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst + fi +} + +# @FUNCTION: mysql-multilib_pkg_postinst +# @DESCRIPTION: +# Run post-installation tasks: +# create the dir for logfiles if non-existant +# touch the logfiles and secure them +# install scripts +# issue required steps for optional features +# issue deprecation warnings +mysql-multilib_pkg_postinst() { + debug-print-function ${FUNCNAME} "$@" + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Check FEATURES="collision-protect" before removing this + [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" + + # Secure the logfiles + touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} + chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* + chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* + + # Minimal builds don't have the MySQL server + if ! use minimal ; then + docinto "support-files" + for script in \ + support-files/my-*.cnf \ + support-files/magic \ + support-files/ndb-config-2-node.ini + do + [[ -f "${script}" ]] \ + && dodoc "${script}" + done + + docinto "scripts" + for script in scripts/mysql* ; do + if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then + dodoc "${script}" + fi + done + + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + if use_if_iuse pam ; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + elog "https://kb.askmonty.org/en/pam-authentication-plugin/" + einfo + fi + fi + + einfo + elog "You might want to run:" + elog "\"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + einfo + + einfo + elog "If you are upgrading major versions, you should run the" + elog "mysql_upgrade tool." + einfo + + if [[ ${PN} == "mariadb-galera" ]] ; then + einfo + elog "Be sure to edit the my.cnf file to activate your cluster settings." + elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" + elog "The first time the cluster is activated, you should add" + elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." + elog "This option should then be removed for subsequent starts." + einfo + fi + fi +} + +# @FUNCTION: mysql-multilib_getopt +# @DESCRIPTION: +# Use my_print_defaults to extract specific config options +mysql-multilib_getopt() { + local mypd="${EROOT}"/usr/bin/my_print_defaults + section="$1" + flag="--${2}=" + "${mypd}" $section | sed -n "/^${flag}/p" +} + +# @FUNCTION: mysql-multilib_getoptval +# @DESCRIPTION: +# Use my_print_defaults to extract specific config options +mysql-multilib_getoptval() { + local mypd="${EROOT}"/usr/bin/my_print_defaults + section="$1" + flag="--${2}=" + "${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp" +} + +# @FUNCTION: mysql-multilib_pkg_config +# @DESCRIPTION: +# Configure mysql environment. +mysql-multilib_pkg_config() { + + debug-print-function ${FUNCNAME} "$@" + + local old_MY_DATADIR="${MY_DATADIR}" + local old_HOME="${HOME}" + # my_print_defaults needs to read stuff in $HOME/.my.cnf + export HOME=/root + + # Make sure the vars are correctly initialized + mysql_init_vars + + [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" + + if built_with_use ${CATEGORY}/${PN} minimal ; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" + + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" + ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" + else + elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" + mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ + || die "Moving MY_DATADIR failed" + fi + else + ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Attempting to use ${MY_DATADIR_s}" + else + eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" + die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" + fi + fi + fi + + local pwd1="a" + local pwd2="b" + local maxtry=15 + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password)" + fi + MYSQL_TMPDIR="$(mysql-multilib_getoptval mysqld tmpdir)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(mysql-multilib_getoptval mysqld relay-log)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(mysql-multilib_getoptval mysqld log-bin)" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + + if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then + einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" + install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR + fi + if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then + einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" + install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN + fi + if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then + einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" + install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG + fi + + if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "(${ROOT}/${MY_DATADIR}/*)" + ewarn "Please rename or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + + einfo "Please provide a password for the mysql 'root' user now, in the" + einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file." + ewarn "Avoid [\"'\\_%] characters in the password" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same" + fi + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + fi + + local options="--log-warnings=0" + local sqltmp="$(emktemp)" + + local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" + [[ -r "${help_tables}" ]] \ + && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ + || touch "${TMPDIR}/fill_help_tables.sql" + help_tables="${TMPDIR}/fill_help_tables.sql" + + # Figure out which options we need to disable to do the setup + helpfile="${TMPDIR}/mysqld-help" + ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null + for opt in grant-tables host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + ndbcluster log-slave-updates \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" + done + # But some options changed names + egrep -sq external-locking "${helpfile}" && \ + options="${options/skip-locking/skip-external-locking}" + + use prefix || options="${options} --user=mysql" + + # Fix bug 446200. Don't reference host my.cnf + use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \ + && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + + # MySQL 5.6+ needs InnoDB + if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then + mysql_version_is_at_least "5.6" || options="${options} --loose-skip-innodb" + fi + + einfo "Creating the mysql database and setting proper" + einfo "permissions on it ..." + + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + mkdir -p "${PID_DIR}" || die "Could not create pid directory" + chown mysql:mysql "${PID_DIR}" || die "Could not set ownership on pid directory" + chmod 755 "${PID_DIR}" || die "Could not set permissions on pid directory" + fi + + pushd "${TMPDIR}" &>/dev/null + #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" + cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db + [[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db + cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'" + einfo "Command: $cmd" + eval $cmd \ + >"${TMPDIR}"/mysql_install_db.log 2>&1 + if [ $? -ne 0 ]; then + grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 + die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" + fi + popd &>/dev/null + [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ + || die "MySQL databases not installed" + chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null + chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null + + # Filling timezones, see + # http://dev.mysql.com/doc/mysql/en/time-zone-support.html + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null + + if [[ -r "${help_tables}" ]] ; then + cat "${help_tables}" >> "${sqltmp}" + fi + + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" + local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" + local mysqld="${EROOT}/usr/sbin/mysqld \ + ${options} \ + --user=mysql \ + --log-warnings=0 \ + --basedir=${EROOT}/usr \ + --datadir=${EROOT}/${MY_DATADIR} \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --default-storage-engine=MyISAM \ + --socket=${socket} \ + --pid-file=${pidfile} + --tmpdir=${EROOT}/${MYSQL_TMPDIR}" + #einfo "About to start mysqld: ${mysqld}" + ebegin "Starting mysqld" + einfo "Command ${mysqld}" + ${mysqld} & + rc=$? + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + eend $rc + + if ! [[ -S "${socket}" ]]; then + die "Completely failed to start up mysqld with: ${mysqld}" + fi + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" + "${EROOT}/usr/bin/mysql" \ + --socket=${socket} \ + -hlocalhost \ + -e "${sql}" + eend $? + + ebegin "Loading \"zoneinfo\", this step may require a few seconds ..." + "${EROOT}/usr/bin/mysql" \ + --socket=${socket} \ + -hlocalhost \ + -uroot \ + --password="${MYSQL_ROOT_PASSWORD}" \ + mysql < "${sqltmp}" + rc=$? + eend $? + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" + + # Stop the server and cleanup + einfo "Stopping the server ..." + kill $(< "${pidfile}" ) + rm -f "${sqltmp}" + wait %1 + einfo "Done" +} diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 049a03503f45..1b316c22e8fb 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -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-v2.eclass,v 1.32 2014/07/19 10:18:41 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.33 2014/07/29 17:59:21 robbat2 Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -83,10 +83,18 @@ fi MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" # Cluster is a special case... -if [[ "${PN}" == "mysql-cluster" ]]; then - case $PV in +if [[ ${PN} == "mysql-cluster" ]]; then + case ${PV} in 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;; - 7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;; + 7.2*) MYSQL_PV_MAJOR=5.5 ;; + 7.3*) MYSQL_PV_MAJOR=5.6 ;; + esac +fi + +# MariaDB has left the numbering schema but keeping compatibility +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + case ${PV} in + 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;; esac fi @@ -209,8 +217,15 @@ esac # Common IUSE IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling" +# This probably could be simplified, but the syntax would have to be just right if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ - mysql_version_is_at_least "5.5" || mysql_check_version_range "5.5.37 to 5.6.11.99" ; then + mysql_version_is_at_least "5.5" ; 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 @@ -260,7 +275,11 @@ DEPEND=" # !dev-db/mariadb-native-client[mysqlcompat] # dev-db/mysql-5.6.12+ only works with dev-libs/libedit -if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then +# 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" +elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then DEPEND="${DEPEND} dev-libs/libedit" else if mysql_version_is_at_least "5.5" ; then diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 6d5cc288335b..c949e271c4d7 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -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.eclass,v 1.179 2014/07/19 10:18:41 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.180 2014/07/29 17:59:21 robbat2 Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -19,7 +19,7 @@ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" -inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs user +inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase @@ -878,7 +878,7 @@ mysql_src_unpack() { unpack ${A} # Grab the patches - [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" @@ -1153,7 +1153,7 @@ mysql_src_install() { -e "s!= /var!= ${EPREFIX}/var!" \ "${FILESDIR}/${mycnf_src}" \ > "${TMPDIR}/my.cnf.ok" - use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok" + use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" if use latin1 ; then sed -i \ -e "/character-set/s|utf8|latin1|g" \ diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index 16bd8299952c..5a28589d643a 100644 --- a/eclass/mysql_fx.eclass +++ b/eclass/mysql_fx.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.31 2014/05/18 19:08:34 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.32 2014/07/29 17:59:21 robbat2 Exp $ # Author: Francesco Riosa (Retired) <vivo@gentoo.org> # Maintainer: |