grknight 14/05/15 03:18:47 Modified: ChangeLog mysql-cmake.eclass mysql-v2.eclass Log: Sync mysql-v2 and mysql-cmake from the mysql overlay
Revision Changes Path 1.1253 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1253&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1253&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1252&r2=1.1253 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1252 retrieving revision 1.1253 diff -u -r1.1252 -r1.1253 --- ChangeLog 12 May 2014 21:56:17 -0000 1.1252 +++ ChangeLog 15 May 2014 03:18:47 -0000 1.1253 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1252 2014/05/12 21:56:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1253 2014/05/15 03:18:47 grknight Exp $ + + 14 May 2014; Brian Evans <[email protected]> + mysql-cmake.eclass, mysql-v2.eclass: + Sync mysql-v2 and mysql-cmake eclasses from the mysql overlay. 12 May 2014; Michał Górny <[email protected]> multilib-build.eclass: Do not install wrapper headers when no ABI provides a particular header. 1.20 eclass/mysql-cmake.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.20&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.20&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.19&r2=1.20 Index: mysql-cmake.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mysql-cmake.eclass 22 Apr 2014 02:00:28 -0000 1.19 +++ mysql-cmake.eclass 15 May 2014 03:18:47 -0000 1.20 @@ -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.19 2014/04/22 02:00:28 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.20 2014/05/15 03:18:47 grknight Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -8,6 +8,7 @@ # - MySQL Team <[email protected]> # - Robin H. Johnson <[email protected]> # - Jorge Manuel B. S. Vicetto <[email protected]> +# - Brian Evans <[email protected]> # @BLURB: This eclass provides the support for cmake based mysql releases # @DESCRIPTION: # The mysql-cmake.eclass provides the support to build the mysql @@ -146,7 +147,6 @@ $(cmake-utils_use_with embedded EMBEDDED_SERVER) $(cmake-utils_use_with profiling) $(cmake-utils_use_enable systemtap DTRACE) - $(cmake-utils_use_enable static-libs STATIC_LIBS) ) if use static; then @@ -189,7 +189,6 @@ if mysql_version_is_at_least 10.0.5 ; then # CassandraSE needs Apache Thrift which is not in portage - # TODO: Add use and deps for Connect SE external deps mycmakeargs+=( -DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0 $(mysql-cmake_use_plugin extraengine SEQUENCE) @@ -307,31 +306,22 @@ -DWITH_ZLIB=system -DWITHOUT_LIBWRAP=1 -DENABLED_LOCAL_INFILE=1 + $(cmake-utils_use_enable static-libs STATIC_LIBS) + -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 ) fi - if use ssl; then - mycmakeargs+=( -DWITH_SSL=system ) - else - mycmakeargs+=( -DWITH_SSL=bundled ) - fi - # Bug 412851 - # MariaDB requires this flag to compile with GPLv3 readline linked + # MariaDB requires NOT_FOR_DISTRIBUTION set to compile with GPLv3 readline linked # Adds a warning about redistribution to configure if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then - mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 ) - fi - - if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then - if use jemalloc ; then - mycmakeargs+=( -DWITH_JEMALLOC="system" ) - else - mycmakeargs+=( -DWITH_JEMALLOC=no ) - fi + mycmakeargs+=( + -DNOT_FOR_DISTRIBUTION=1 + -DWITH_JEMALLOC=$(usex jemalloc system) + ) mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system ) fi @@ -415,7 +405,7 @@ esac einfo "Building default my.cnf (${mysql_mycnf_version})" insinto "${MY_SYSCONFDIR#${EPREFIX}}" - doins scripts/mysqlaccess.conf + doins "${S}"/scripts/mysqlaccess.conf mycnf_src="my.cnf-${mysql_mycnf_version}" sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ "${FILESDIR}/${mycnf_src}" \ 1.29 eclass/mysql-v2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.28&r2=1.29 Index: mysql-v2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mysql-v2.eclass 24 Apr 2014 03:01:34 -0000 1.28 +++ mysql-v2.eclass 15 May 2014 03:18:47 -0000 1.29 @@ -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.28 2014/04/24 03:01:34 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.29 2014/05/15 03:18:47 grknight Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -8,6 +8,7 @@ # - MySQL Team <[email protected]> # - Robin H. Johnson <[email protected]> # - Jorge Manuel B. S. Vicetto <[email protected]> +# - Brian Evans <[email protected]> # @BLURB: This eclass provides most of the functions for mysql ebuilds # @DESCRIPTION: # The mysql-v2.eclass is the base eclass to build the mysql and @@ -175,10 +176,11 @@ mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 http://g3nt8.org/patches/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/~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." +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" HOMEPAGE="http://www.mysql.com/"; if [[ ${PN} == "mariadb" ]]; then HOMEPAGE="http://mariadb.org/"; @@ -190,7 +192,7 @@ fi if [[ ${PN} == "percona-server" ]]; then HOMEPAGE="http://www.percona.com/software/percona-server"; - DESCRIPTION="An enhanced, drop-in replacement fro MySQL from the Percona team" + DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team" fi LICENSE="GPL-2" SLOT="0" @@ -274,8 +276,7 @@ fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )" if mysql_version_is_at_least "10.0.9" ; then - use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \ - DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" fi fi @@ -765,7 +766,7 @@ 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 innodb ssl log-bin relay-log slow-query-log external-locking \ + federated ssl log-bin relay-log slow-query-log external-locking \ ndbcluster log-slave-updates \ ; do optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" @@ -781,11 +782,27 @@ 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}" + cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}'" einfo "Command: $cmd" eval $cmd \ >"${TMPDIR}"/mysql_install_db.log 2>&1 @@ -807,17 +824,6 @@ cat "${help_tables}" >> "${sqltmp}" 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 "${PID_DIR}" - chown mysql:mysql "${PID_DIR}" - chmod 755 "${PID_DIR}" - 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 \
