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 2FFB91381F3 for ; Fri, 20 Sep 2013 15:13:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E552EE0AA9; Fri, 20 Sep 2013 15:13:41 +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 804A6E0AA9 for ; Fri, 20 Sep 2013 15:13:41 +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 7497733E788 for ; Fri, 20 Sep 2013 15:13:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DE162E530A for ; Fri, 20 Sep 2013 15:13:37 +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: <1379690002.6109a7d535cd3a29e56d58e67a0589dd5dc35647.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 6109a7d535cd3a29e56d58e67a0589dd5dc35647 X-VCS-Branch: master Date: Fri, 20 Sep 2013 15:13:37 +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: fab62ddb-be82-4413-9daa-dee0bf4ab011 X-Archives-Hash: 4f49a9c4d7eec4fe8a1995b07c588834 commit: 6109a7d535cd3a29e56d58e67a0589dd5dc35647 Author: Brian Evans lavabit com> AuthorDate: Fri Sep 20 15:13:22 2013 +0000 Commit: Brian Evans lavabit com> CommitDate: Fri Sep 20 15:13:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6109a7d5 Add mysql-galera to checks in mysql-cmake.eclass --- eclass/mysql-cmake.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 5c2a3d3..48378bd 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -188,7 +188,7 @@ configure_cmake_standard() { mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) ) fi - if [[ ${PN} == "mariadb" ]]; then + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then mycmakeargs+=( $(mysql-cmake_use_plugin oqgraph OQGRAPH) $(mysql-cmake_use_plugin sphinx SPHINX) @@ -309,7 +309,7 @@ mysql-cmake_src_configure() { # Bug 412851 # MariaDB requires this flag to compile with GPLv3 readline linked # Adds a warning about redistribution to configure - if [[ ${PN} == "mariadb" ]] ; then + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 ) fi @@ -371,7 +371,7 @@ mysql-cmake_src_install() { dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" # Create a mariadb_config symlink - [[ ${PN} == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config" + [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config" # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir rm -Rf "${ED}/usr/data" @@ -458,6 +458,6 @@ mysql-cmake_src_install() { doenvd "${T}"/80mysql-libdir #Remove mytop if perl is not selected - [[ ${PN} == "mariadb" ]] && ! use perl \ + [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \ && rm -f "${ED}/usr/bin/mytop" }