commit: 80ff75dfa87fdd93388b18c56b92584f3d29b5cf Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Mon Jul 17 19:05:09 2017 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Mon Jul 17 19:23:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=80ff75df
Update eclasses for GLEP73 and other bugs eclass/mysql-multilib-r1.eclass | 1 + eclass/mysql-multilib.eclass | 19 ++++++------------- eclass/mysql-v2.eclass | 16 +++++----------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index 44eb631..930411d 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -450,6 +450,7 @@ multilib_src_configure() { if multilib_is_native_abi && use server ; then + # systemd is only linked to for server notification if in_iuse systemd ; then mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) ) fi diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index c3f4299..14e1913 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,5 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -228,9 +227,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then # 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" if [[ ${HAS_TOOLS_PATCH} ]] ; then - REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" + REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) tokudb? ( jemalloc !tcmalloc )" else - REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" + REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc !tcmalloc )" fi # 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 @@ -266,7 +265,7 @@ fi REQUIRED_USE=" ${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) - static? ( yassl )" + static? ( yassl !openssl !libressl )" # # DEPENDENCIES: @@ -943,14 +942,8 @@ mysql-multilib_pkg_config() { mysql_init_vars [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" - if [[ ${HAS_TOOLS_PATCH} ]] ; then - if ! built_with_use ${CATEGORY}/${PN} server ; then - die "Minimal builds do NOT include the MySQL server" - fi - else - if built_with_use ${CATEGORY}/${PN} minimal ; then - die "Minimal builds do NOT include the MySQL server" - fi + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then + die "Minimal builds do NOT include the MySQL server" fi if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index dda63c3..3734e19 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,5 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -183,7 +182,6 @@ SRC_URI="${SERVER_URI}" if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then SRC_URI="${SRC_URI} mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 - http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" @@ -242,9 +240,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam" # 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} tokudb odbc xml" && \ - REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc )" + REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc !tcmalloc )" mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" && \ - REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc )" + REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc !tcmalloc )" fi if mysql_version_is_at_least "5.5"; then @@ -359,11 +357,8 @@ 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 - # - # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst RDEPEND="${RDEPEND} =sys-cluster/galera-${WSREP_REVISION}* - sys-process/lsof " fi @@ -514,8 +509,7 @@ mysql-v2_pkg_setup() { mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup fi - if use_if_iuse tokudb && [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 || \ - $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then + 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 @@ -703,7 +697,7 @@ mysql-v2_pkg_config() { [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" - if built_with_use ${CATEGORY}/${PN} minimal ; then + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then die "Minimal builds do NOT include the MySQL server" fi @@ -897,7 +891,7 @@ mysql-v2_pkg_config() { -e "${sql}" eend $? - ebegin "Loading \"zoneinfo\", this step may require a few seconds ..." + ebegin "Loading \"zoneinfo\", this step may require a few seconds" "${EROOT}/usr/bin/mysql" \ --socket=${socket} \ -hlocalhost \