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 0F9DC13827E for ; Fri, 24 Jan 2014 18:54:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 507ABE0B2E; Fri, 24 Jan 2014 18:54:53 +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 DA234E0B2E for ; Fri, 24 Jan 2014 18:54:52 +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 C885833DA93 for ; Fri, 24 Jan 2014 18:54:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 10123183B3 for ; Fri, 24 Jan 2014 18:54:50 +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: <1390589678.344ef59f62b19f9b9d3e3fb683739959ba2ae9d3.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: 344ef59f62b19f9b9d3e3fb683739959ba2ae9d3 X-VCS-Branch: master Date: Fri, 24 Jan 2014 18:54:50 +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: 170be37c-52fb-43d0-bbd8-71f13c207cc5 X-Archives-Hash: 8a158ab8cdc6d93b20e3dad3998b4337 commit: 344ef59f62b19f9b9d3e3fb683739959ba2ae9d3 Author: Brian Evans tuffmail com> AuthorDate: Fri Jan 24 18:54:38 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Fri Jan 24 18:54:38 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=344ef59f [eclass] Fix libedit dep for mysql/percona 5.6.12+ --- eclass/mysql-cmake.eclass | 10 ++++++++-- eclass/mysql-v2.eclass | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 91c8e32..6fb9228 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -125,7 +125,6 @@ configure_cmake_minimal() { -DWITHOUT_LIBWRAP=1 -DWITH_READLINE=0 -DWITH_LIBEDIT=0 - -DWITH_EDITLINE=system -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 -DWITHOUT_CSV_STORAGE_ENGINE=1 @@ -137,6 +136,10 @@ configure_cmake_minimal() { -DWITHOUT_PARTITION_STORAGE_ENGINE=1 -DWITHOUT_INNOBASE_STORAGE_ENGINE=1 ) + + if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then + mycmakeargs+=( -DWITH_EDITLINE=system ) + fi } # @FUNCTION: configure_cmake_standard @@ -153,9 +156,12 @@ configure_cmake_standard() { -DWITH_LIBEDIT=0 -DWITH_ZLIB=system -DWITHOUT_LIBWRAP=1 - -DWITH_EDITLINE=system ) + if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then + mycmakeargs+=( -DWITH_EDITLINE=system ) + fi + mycmakeargs+=( $(cmake-utils_use_disable !static SHARED) $(cmake-utils_use_with debug) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index f11d660..ddb7e67 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -255,8 +255,8 @@ DEPEND=" !dev-db/mariadb-native-client[mysqlcompat] " -# dev-db/mysql-5.7.3+ only works with dev-libs/libedit -if [[ ${PN} == "mysql" ]] && mysql_version_is_at_least "5.7.3" ; then +# dev-db/mysql-5.6.12+ only works with dev-libs/libedit +if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then DEPEND="${DEPEND} dev-libs/libedit" else DEPEND="${DEPEND} >=sys-libs/readline-4.1"