From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BE028138247 for ; Mon, 20 Jan 2014 14:04:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59B36E0BC3; Mon, 20 Jan 2014 14:04:35 +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 D23F9E0BC3 for ; Mon, 20 Jan 2014 14:04:34 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [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 DB1C433F12F for ; Mon, 20 Jan 2014 14:04:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A5B731871B for ; Mon, 20 Jan 2014 14:04:32 +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: <1390226607.1efb040f0c9c0b0b7759fe2e09c1cb3c853ab7c2.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: 1efb040f0c9c0b0b7759fe2e09c1cb3c853ab7c2 X-VCS-Branch: master Date: Mon, 20 Jan 2014 14:04:32 +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: b3ccab7d-1c9a-4e14-8500-25f48ef2ab09 X-Archives-Hash: 68d292f4c573d8dd42db19fec39d57ce commit: 1efb040f0c9c0b0b7759fe2e09c1cb3c853ab7c2 Author: Brian Evans tuffmail com> AuthorDate: Mon Jan 20 14:03:27 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Mon Jan 20 14:03:27 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1efb040f [eclass] Use more descriptive functions from eutils and fix deps --- eclass/mysql-cmake.eclass | 14 +++++++------- eclass/mysql-v2.eclass | 21 ++++++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 615a579..81f465e 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -15,7 +15,7 @@ # the src_prepare, src_configure, src_compile, and src_install # phase hooks. -inherit cmake-utils flag-o-matic multilib prefix +inherit cmake-utils flag-o-matic multilib prefix eutils # # HELPER FUNCTIONS: @@ -74,7 +74,7 @@ mysql-cmake_disable_test() { # and some check WITHOUT_. Also, this can easily extend to non-storage plugins. mysql-cmake_use_plugin() { [[ -z $2 ]] && die "mysql-cmake_use_plugin " - if use $1 ; then + if use_if_iuse $1 ; then echo "-DWITH_$2=1" else echo "-DWITHOUT_$2=1 -DWITH_$2=0" @@ -193,7 +193,7 @@ configure_cmake_standard() { $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) - if pbxt_available ; then + if in_iuse pbxt ; then mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) ) fi @@ -284,7 +284,7 @@ mysql-cmake_src_prepare() { echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" fi - if has tokudb ${IUSE} ; then + if in_iuse tokudb ; then # Don't build bundled xz-utils rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" @@ -345,14 +345,14 @@ mysql-cmake_src_configure() { filter-flags "-O" "-O[01]" CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" + CXXFLAGS="${CXXFLAGS} -felide-constructors" # 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! + # As of 5.7, exceptions and rtti are used! if ! mysql_version_is_at_least "5.7" ; then - CXXFLAGS="${CXXFLAGS} -fno-exceptions" + CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti" fi export CXXFLAGS diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 1c3eff3..824158f 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -263,6 +263,12 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" # Bug 441700 MariaDB >=5.3 include custom mytop mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )" + if mysql_version_is_at_least "10.0.5" ; then + DEPEND="${DEPEND} + odbc? ( dev-db/unixODBC ) + xml? ( dev-libs/libxml2 ) + " + fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )" fi @@ -304,13 +310,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) " fi - - if mysql_version_is_at_least "10.0.5" ; then - RDEPEND="${RDEPEND} - odbc? ( dev-db/unixODBC ) - xml? ( dev-libs/libxml2 ) - " - fi fi if [[ ${PN} == "mariadb-galera" ]] ; then @@ -351,7 +350,7 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}" # External patches # -# MariaDB has integrated PBXT +# MariaDB has integrated PBXT until it was dropped in version 5.5.33 # PBXT_VERSION means that we have a PBXT patch for this PV # PBXT was only introduced after 5.1.12 pbxt_patch_available() { @@ -469,7 +468,7 @@ mysql-v2_pkg_setup() { mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup fi - if has tokudb ${IUSE} && use tokudb && [[ $(gcc-version) < 4.7 ]] ; then + if use_if_iuse tokudb && [[ $(gcc-version) < 4.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 @@ -575,7 +574,7 @@ mysql-v2_pkg_postinst() { done if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then - if mysql_version_is_at_least "5.2.10" && use pam ; 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:" @@ -603,7 +602,7 @@ mysql-v2_pkg_postinst() { einfo fi - if pbxt_available && use pbxt ; then + if use_if_iuse pbxt ; then elog "Note: PBXT is now statically built when enabled." elog "" elog "If, you previously installed as a plugin and "