From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 97F951393E9 for ; Thu, 15 May 2014 03:11:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FEEBE09D7; Thu, 15 May 2014 03:11:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56B6DE09D7 for ; Thu, 15 May 2014 03:11:26 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C25633FD1C for ; Thu, 15 May 2014 03:11:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E081F1818D for ; Thu, 15 May 2014 03:11:23 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1400123468.0002fb2c57a23c8a371f10743e84bc539ed5db19.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 0002fb2c57a23c8a371f10743e84bc539ed5db19 X-VCS-Branch: master Date: Thu, 15 May 2014 03:11:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 026054c6-be4d-4e53-8bbc-dccc4bceb1a1 X-Archives-Hash: 9edd3f818a3d8d0d76cf5970a06d8a0c commit: 0002fb2c57a23c8a371f10743e84bc539ed5db19 Author: Brian Evans gentoo org> AuthorDate: Thu May 15 03:11:08 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Thu May 15 03:11:08 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0002fb2c [eclass] Cleanup and add usex when useful --- eclass/mysql-cmake.eclass | 27 ++++++++------------------- eclass/mysql-v2.eclass | 7 ++++--- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 7bfdf53..2102845 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -8,6 +8,7 @@ # - MySQL Team # - Robin H. Johnson # - Jorge Manuel B. S. Vicetto +# - Brian Evans # @BLURB: This eclass provides the support for cmake based mysql releases # @DESCRIPTION: # The mysql-cmake.eclass provides the support to build the mysql @@ -129,7 +130,6 @@ configure_cmake_minimal() { -DWITHOUT_MYISAM_STORAGE_ENGINE=1 -DWITHOUT_PARTITION_STORAGE_ENGINE=1 -DWITHOUT_INNOBASE_STORAGE_ENGINE=1 - $(cmake-utils_use_enable static-libs STATIC_LIBS) ) } @@ -147,7 +147,6 @@ configure_cmake_standard() { $(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 @@ -190,7 +189,6 @@ configure_cmake_standard() { 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) @@ -308,31 +306,22 @@ mysql-cmake_src_configure() { -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 diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 3f904ef..3a9954a 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -8,6 +8,7 @@ # - MySQL Team # - Robin H. Johnson # - Jorge Manuel B. S. Vicetto +# - Brian Evans # @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 @@ -792,9 +793,9 @@ mysql-v2_pkg_config() { # 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}" - chown mysql:mysql "${PID_DIR}" - chmod 755 "${PID_DIR}" + 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