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 E8996138A1A for ; Tue, 10 Feb 2015 18:36:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78544E0938; Tue, 10 Feb 2015 18:36:44 +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 B837CE09B9 for ; Tue, 10 Feb 2015 18:36:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F3E93407A4 for ; Tue, 10 Feb 2015 18:36:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 342C81178E for ; Tue, 10 Feb 2015 18:36:41 +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: <1423593394.ff80564e7ad7a200b184c5762fe225e0e95ded57.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: ff80564e7ad7a200b184c5762fe225e0e95ded57 X-VCS-Branch: master Date: Tue, 10 Feb 2015 18:36:41 +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: ec72188a-b9f8-4d85-a6bd-7c7170f2dadb X-Archives-Hash: 881ae06a90bfc023bfc682790fc346c3 commit: ff80564e7ad7a200b184c5762fe225e0e95ded57 Author: Brian Evans gentoo org> AuthorDate: Tue Feb 10 18:36:34 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Feb 10 18:36:34 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ff80564e Sync changes from portage tree for mysql-multilib.eclass --- eclass/mysql-multilib.eclass | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 1749cb2..5312dd2 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.12 2015/01/28 13:48:58 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.14 2015/02/10 18:14:23 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -212,8 +212,7 @@ 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 )" + mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" # MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries @@ -239,7 +238,7 @@ fi REQUIRED_USE=" ${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) - minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" + minimal? ( !extraengine !embedded ) static? ( !ssl )" # # DEPENDENCIES: @@ -254,6 +253,7 @@ DEPEND=" sys-process/procps:0= dev-libs/libaio:0= ) + sys-libs/ncurses >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] @@ -300,8 +300,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then 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= ) + extraengine? ( + 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= )" @@ -375,10 +377,12 @@ if [[ ${PN} == "mysql-cluster" ]] ; then fi # compile-time-only +# ncurses only needs multilib for compile time due to a binary that will be not installed DEPEND="${DEPEND} virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.8.9 + sys-libs/ncurses[${MULTILIB_USEDEP}] " # For other stuff to bring us in @@ -389,6 +393,9 @@ PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) # my_config.h includes ABI specific data MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) +[[ ${PN} == "mysql-cluster" ]] && \ + MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h ) + [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "10.1.1" && \ MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) @@ -592,6 +599,11 @@ multilib_src_configure() { configure_cmake_minimal fi + # Always build NDB with mysql-cluster for libndbclient + [[ ${PN} == "mysql-cluster" ]] && mycmakeargs+=( + -DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1 + -DWITHOUT_PARTITION_STORAGE_ENGINE=0 ) + cmake-utils_src_configure }