commit: ea6e35d0e7f38d5023bbd3e3282502ea7f620697
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 15:11:21 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 15:11:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ea6e35d0
Always build the command line tools
eclass/mysql-cmake.eclass | 12 +++++-------
eclass/mysql-multilib.eclass | 31 +++++++++++--------------------
2 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 55babbc..0d0a1be 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -428,13 +428,11 @@ mysql-cmake_src_install() {
cmake-utils_src_install
- if ! in_iuse tools || use_if_iuse tools ; then
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call
binary"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
- fi
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
if [[ -z ${HAS_TOOLS_PATCH} ]] ; then
# Create a mariadb_config symlink
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a786828..2a37bcc 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -237,8 +237,8 @@ if [[ ${PN} == "percona-server" ]]; then
fi
if [[ ${HAS_TOOLS_PATCH} ]] ; then
- IUSE="${IUSE} client-libs +server +tools"
- REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded )
server? ( tools ) || ( client-libs server tools )"
+ IUSE="${IUSE} client-libs +server"
+ REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) || (
client-libs server )"
else
IUSE="${IUSE} minimal"
REQUIRED_USE="${REQUIRED_USE} minimal? ( !extraengine !embedded )"
@@ -261,6 +261,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?]
@@ -270,12 +271,6 @@ DEPEND="
systemtap? ( >=dev-util/systemtap-1.3:0= )
"
-if [[ ${HAS_TOOLS_PATCH} ]] ; then
- DEPEND="${DEPEND} tools? ( sys-libs/ncurses ) embedded? (
sys-libs/ncurses )"
-else
- DEPEND="${DEPEND} sys-libs/ncurses"
-fi
-
### Begin readline/libedit
### If the world was perfect, we would use external libedit on both to have a
similar experience
### However libedit does not seem to support UTF-8 keyboard input
@@ -298,7 +293,7 @@ fi
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
# Readline is only used for the command-line and embedded example
if [[ ${HAS_TOOLS_PATCH} ]] ; then
- DEPEND="${DEPEND} !bindist? ( tools? (
>=sys-libs/readline-4.1:0= ) embedded? ( >=sys-libs/readline-4.1:0= ) )"
+ DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0= )"
else
DEPEND="${DEPEND} !bindist? (
>=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
fi
@@ -427,7 +422,7 @@ DEPEND="${DEPEND}
>=dev-util/cmake-2.8.9
"
-# Transition dep until all ebuilds have tools USE
+# Transition dep until all ebuilds have client-libs patch and USE
if ! [[ ${HAS_TOOLS_PATCH} ]] ; then
DEPEND="${DEPEND} sys-libs/ncurses[${MULTILIB_USEDEP}]"
fi
@@ -612,11 +607,9 @@ multilib_src_configure() {
if in_iuse client-libs ; then
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) )
- fi
- if in_iuse tools ; then
if multilib_is_native_abi ; then
- mycmakeargs+=( -DWITHOUT_TOOLS=$(usex tools 0 1) )
+ mycmakeargs+=( -DWITHOUT_TOOLS=0 )
else
mycmakeargs+=( -DWITHOUT_TOOLS=1 )
fi
@@ -629,13 +622,11 @@ multilib_src_configure() {
-DWITH_READLINE=$(usex bindist 1 0)
-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
)
- else
- if ! in_iuse tools ; then
- mycmakeargs+=(
- -DWITH_READLINE=1
- -DNOT_FOR_DISTRIBUTION=0
- )
- fi
+ elif ! in_iuse client-libs ; then
+ mycmakeargs+=(
+ -DWITH_READLINE=1
+ -DNOT_FOR_DISTRIBUTION=0
+ )
fi
fi
