| 1 |
commit: 344ef59f62b19f9b9d3e3fb683739959ba2ae9d3 |
| 2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
| 3 |
AuthorDate: Fri Jan 24 18:54:38 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Fri Jan 24 18:54:38 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=344ef59f |
| 7 |
|
| 8 |
[eclass] Fix libedit dep for mysql/percona 5.6.12+ |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-cmake.eclass | 10 ++++++++-- |
| 12 |
eclass/mysql-v2.eclass | 4 ++-- |
| 13 |
2 files changed, 10 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
| 16 |
index 91c8e32..6fb9228 100644 |
| 17 |
--- a/eclass/mysql-cmake.eclass |
| 18 |
+++ b/eclass/mysql-cmake.eclass |
| 19 |
@@ -125,7 +125,6 @@ configure_cmake_minimal() { |
| 20 |
-DWITHOUT_LIBWRAP=1 |
| 21 |
-DWITH_READLINE=0 |
| 22 |
-DWITH_LIBEDIT=0 |
| 23 |
- -DWITH_EDITLINE=system |
| 24 |
-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 |
| 25 |
-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 |
| 26 |
-DWITHOUT_CSV_STORAGE_ENGINE=1 |
| 27 |
@@ -137,6 +136,10 @@ configure_cmake_minimal() { |
| 28 |
-DWITHOUT_PARTITION_STORAGE_ENGINE=1 |
| 29 |
-DWITHOUT_INNOBASE_STORAGE_ENGINE=1 |
| 30 |
) |
| 31 |
+ |
| 32 |
+ if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
| 33 |
+ mycmakeargs+=( -DWITH_EDITLINE=system ) |
| 34 |
+ fi |
| 35 |
} |
| 36 |
|
| 37 |
# @FUNCTION: configure_cmake_standard |
| 38 |
@@ -153,9 +156,12 @@ configure_cmake_standard() { |
| 39 |
-DWITH_LIBEDIT=0 |
| 40 |
-DWITH_ZLIB=system |
| 41 |
-DWITHOUT_LIBWRAP=1 |
| 42 |
- -DWITH_EDITLINE=system |
| 43 |
) |
| 44 |
|
| 45 |
+ if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
| 46 |
+ mycmakeargs+=( -DWITH_EDITLINE=system ) |
| 47 |
+ fi |
| 48 |
+ |
| 49 |
mycmakeargs+=( |
| 50 |
$(cmake-utils_use_disable !static SHARED) |
| 51 |
$(cmake-utils_use_with debug) |
| 52 |
|
| 53 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 54 |
index f11d660..ddb7e67 100644 |
| 55 |
--- a/eclass/mysql-v2.eclass |
| 56 |
+++ b/eclass/mysql-v2.eclass |
| 57 |
@@ -255,8 +255,8 @@ DEPEND=" |
| 58 |
!dev-db/mariadb-native-client[mysqlcompat] |
| 59 |
" |
| 60 |
|
| 61 |
-# dev-db/mysql-5.7.3+ only works with dev-libs/libedit |
| 62 |
-if [[ ${PN} == "mysql" ]] && mysql_version_is_at_least "5.7.3" ; then |
| 63 |
+# dev-db/mysql-5.6.12+ only works with dev-libs/libedit |
| 64 |
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
| 65 |
DEPEND="${DEPEND} dev-libs/libedit" |
| 66 |
else |
| 67 |
DEPEND="${DEPEND} >=sys-libs/readline-4.1" |
Archives