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 2534D138247 for ; Tue, 19 Nov 2013 15:19:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 797E4E0942; Tue, 19 Nov 2013 15:19:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7454E0942 for ; Tue, 19 Nov 2013 15:19:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA97933F17B for ; Tue, 19 Nov 2013 15:19:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 68700E5459 for ; Tue, 19 Nov 2013 15:19:10 +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: <1384873956.3dbfadde22858b2e521b62351fa3372a9f481161.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: 3dbfadde22858b2e521b62351fa3372a9f481161 X-VCS-Branch: master Date: Tue, 19 Nov 2013 15:19:10 +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: 685b55b6-0f55-41e6-803e-6c93d9460d93 X-Archives-Hash: f742e7167d466eb47a6d31bd3e9c60f7 commit: 3dbfadde22858b2e521b62351fa3372a9f481161 Author: Brian Evans tuffmail com> AuthorDate: Tue Nov 19 15:12:36 2013 +0000 Commit: Brian Evans lavabit com> CommitDate: Tue Nov 19 15:12:36 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3dbfadde [eclass] Add support for xml and odbc in the CONNECT engine in MariaDB 10.0.5+ --- eclass/mysql-cmake.eclass | 4 ++-- eclass/mysql-v2.eclass | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index d6a965e..4da7ede 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -221,8 +221,8 @@ configure_cmake_standard() { $(mysql-cmake_use_plugin extraengine SPIDER) $(mysql-cmake_use_plugin extraengine CONNECT) -DCONNECT_WITH_MYSQL=1 - -DCONNECT_WITH_LIBXML=0 - -DCONNECT_WITH_ODBC=0 + $(cmake-utils_use xml CONNECT_WITH_LIBXML2) + $(cmake-utils_use odbc CONNECT_WITH_ODBC) ) fi fi diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index dd85b31..95266d0 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -218,12 +218,13 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam" - mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb" + mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb odbc xml" && \ + REQUIRED_USE="odbc? ( extraengine ) xml? ( extraengine )" mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" fi if mysql_version_is_at_least "5.5"; then - REQUIRED_USE="tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )" + REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )" IUSE="${IUSE} jemalloc tcmalloc" fi @@ -300,6 +301,13 @@ 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