| 1 |
commit: ea6e35d0e7f38d5023bbd3e3282502ea7f620697 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 7 15:11:21 2015 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 7 15:11:21 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ea6e35d0 |
| 7 |
|
| 8 |
Always build the command line tools |
| 9 |
|
| 10 |
eclass/mysql-cmake.eclass | 12 +++++------- |
| 11 |
eclass/mysql-multilib.eclass | 31 +++++++++++-------------------- |
| 12 |
2 files changed, 16 insertions(+), 27 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
| 15 |
index 55babbc..0d0a1be 100644 |
| 16 |
--- a/eclass/mysql-cmake.eclass |
| 17 |
+++ b/eclass/mysql-cmake.eclass |
| 18 |
@@ -428,13 +428,11 @@ mysql-cmake_src_install() { |
| 19 |
|
| 20 |
cmake-utils_src_install |
| 21 |
|
| 22 |
- if ! in_iuse tools || use_if_iuse tools ; then |
| 23 |
- # Convenience links |
| 24 |
- einfo "Making Convenience links for mysqlcheck multi-call binary" |
| 25 |
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" |
| 26 |
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" |
| 27 |
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" |
| 28 |
- fi |
| 29 |
+ # Convenience links |
| 30 |
+ einfo "Making Convenience links for mysqlcheck multi-call binary" |
| 31 |
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" |
| 32 |
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" |
| 33 |
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" |
| 34 |
|
| 35 |
if [[ -z ${HAS_TOOLS_PATCH} ]] ; then |
| 36 |
# Create a mariadb_config symlink |
| 37 |
|
| 38 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 39 |
index a786828..2a37bcc 100644 |
| 40 |
--- a/eclass/mysql-multilib.eclass |
| 41 |
+++ b/eclass/mysql-multilib.eclass |
| 42 |
@@ -237,8 +237,8 @@ if [[ ${PN} == "percona-server" ]]; then |
| 43 |
fi |
| 44 |
|
| 45 |
if [[ ${HAS_TOOLS_PATCH} ]] ; then |
| 46 |
- IUSE="${IUSE} client-libs +server +tools" |
| 47 |
- REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) server? ( tools ) || ( client-libs server tools )" |
| 48 |
+ IUSE="${IUSE} client-libs +server" |
| 49 |
+ REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) || ( client-libs server )" |
| 50 |
else |
| 51 |
IUSE="${IUSE} minimal" |
| 52 |
REQUIRED_USE="${REQUIRED_USE} minimal? ( !extraengine !embedded )" |
| 53 |
@@ -261,6 +261,7 @@ DEPEND=" |
| 54 |
sys-process/procps:0= |
| 55 |
dev-libs/libaio:0= |
| 56 |
) |
| 57 |
+ sys-libs/ncurses |
| 58 |
>=sys-apps/sed-4 |
| 59 |
>=sys-apps/texinfo-4.7-r1 |
| 60 |
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] |
| 61 |
@@ -270,12 +271,6 @@ DEPEND=" |
| 62 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
| 63 |
" |
| 64 |
|
| 65 |
-if [[ ${HAS_TOOLS_PATCH} ]] ; then |
| 66 |
- DEPEND="${DEPEND} tools? ( sys-libs/ncurses ) embedded? ( sys-libs/ncurses )" |
| 67 |
-else |
| 68 |
- DEPEND="${DEPEND} sys-libs/ncurses" |
| 69 |
-fi |
| 70 |
- |
| 71 |
### Begin readline/libedit |
| 72 |
### If the world was perfect, we would use external libedit on both to have a similar experience |
| 73 |
### However libedit does not seem to support UTF-8 keyboard input |
| 74 |
@@ -298,7 +293,7 @@ fi |
| 75 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 76 |
# Readline is only used for the command-line and embedded example |
| 77 |
if [[ ${HAS_TOOLS_PATCH} ]] ; then |
| 78 |
- DEPEND="${DEPEND} !bindist? ( tools? ( >=sys-libs/readline-4.1:0= ) embedded? ( >=sys-libs/readline-4.1:0= ) )" |
| 79 |
+ DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0= )" |
| 80 |
else |
| 81 |
DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" |
| 82 |
fi |
| 83 |
@@ -427,7 +422,7 @@ DEPEND="${DEPEND} |
| 84 |
>=dev-util/cmake-2.8.9 |
| 85 |
" |
| 86 |
|
| 87 |
-# Transition dep until all ebuilds have tools USE |
| 88 |
+# Transition dep until all ebuilds have client-libs patch and USE |
| 89 |
if ! [[ ${HAS_TOOLS_PATCH} ]] ; then |
| 90 |
DEPEND="${DEPEND} sys-libs/ncurses[${MULTILIB_USEDEP}]" |
| 91 |
fi |
| 92 |
@@ -612,11 +607,9 @@ multilib_src_configure() { |
| 93 |
|
| 94 |
if in_iuse client-libs ; then |
| 95 |
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) ) |
| 96 |
- fi |
| 97 |
|
| 98 |
- if in_iuse tools ; then |
| 99 |
if multilib_is_native_abi ; then |
| 100 |
- mycmakeargs+=( -DWITHOUT_TOOLS=$(usex tools 0 1) ) |
| 101 |
+ mycmakeargs+=( -DWITHOUT_TOOLS=0 ) |
| 102 |
else |
| 103 |
mycmakeargs+=( -DWITHOUT_TOOLS=1 ) |
| 104 |
fi |
| 105 |
@@ -629,13 +622,11 @@ multilib_src_configure() { |
| 106 |
-DWITH_READLINE=$(usex bindist 1 0) |
| 107 |
-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) |
| 108 |
) |
| 109 |
- else |
| 110 |
- if ! in_iuse tools ; then |
| 111 |
- mycmakeargs+=( |
| 112 |
- -DWITH_READLINE=1 |
| 113 |
- -DNOT_FOR_DISTRIBUTION=0 |
| 114 |
- ) |
| 115 |
- fi |
| 116 |
+ elif ! in_iuse client-libs ; then |
| 117 |
+ mycmakeargs+=( |
| 118 |
+ -DWITH_READLINE=1 |
| 119 |
+ -DNOT_FOR_DISTRIBUTION=0 |
| 120 |
+ ) |
| 121 |
fi |
| 122 |
fi |
Archives