| 1 |
commit: e2b77e3d6071bc5238af0729b6e81462d5304ad4 |
| 2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
| 3 |
AuthorDate: Thu Jan 23 04:18:04 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Thu Jan 23 04:18:04 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e2b77e3d |
| 7 |
|
| 8 |
[mysql] Fix 5.7 libraries and patches |
| 9 |
|
| 10 |
--- |
| 11 |
dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild | 6 +++--- |
| 12 |
eclass/mysql-cmake.eclass | 2 ++ |
| 13 |
eclass/mysql-v2.eclass | 8 +++++++- |
| 14 |
3 files changed, 12 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild |
| 17 |
index 2977f9b..7f2d236 100644 |
| 18 |
--- a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild |
| 19 |
+++ b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild |
| 20 |
@@ -1,10 +1,10 @@ |
| 21 |
-# Copyright 1999-2013 Gentoo Foundation |
| 22 |
+# Copyright 1999-2014 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $ |
| 25 |
+# $Header: $ |
| 26 |
|
| 27 |
EAPI="4" |
| 28 |
|
| 29 |
-MY_EXTRAS_VER="none" |
| 30 |
+MY_EXTRAS_VER="live" |
| 31 |
MY_PV="${PV//_alpha_pre/-m}" |
| 32 |
MY_PV="${MY_PV//_/-}" |
| 33 |
|
| 34 |
|
| 35 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
| 36 |
index 81f465e..91c8e32 100644 |
| 37 |
--- a/eclass/mysql-cmake.eclass |
| 38 |
+++ b/eclass/mysql-cmake.eclass |
| 39 |
@@ -125,6 +125,7 @@ configure_cmake_minimal() { |
| 40 |
-DWITHOUT_LIBWRAP=1 |
| 41 |
-DWITH_READLINE=0 |
| 42 |
-DWITH_LIBEDIT=0 |
| 43 |
+ -DWITH_EDITLINE=system |
| 44 |
-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 |
| 45 |
-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 |
| 46 |
-DWITHOUT_CSV_STORAGE_ENGINE=1 |
| 47 |
@@ -152,6 +153,7 @@ configure_cmake_standard() { |
| 48 |
-DWITH_LIBEDIT=0 |
| 49 |
-DWITH_ZLIB=system |
| 50 |
-DWITHOUT_LIBWRAP=1 |
| 51 |
+ -DWITH_EDITLINE=system |
| 52 |
) |
| 53 |
|
| 54 |
mycmakeargs+=( |
| 55 |
|
| 56 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 57 |
index 824158f..f11d660 100644 |
| 58 |
--- a/eclass/mysql-v2.eclass |
| 59 |
+++ b/eclass/mysql-v2.eclass |
| 60 |
@@ -251,11 +251,17 @@ DEPEND=" |
| 61 |
kernel_linux? ( sys-process/procps ) |
| 62 |
>=sys-apps/sed-4 |
| 63 |
>=sys-apps/texinfo-4.7-r1 |
| 64 |
- >=sys-libs/readline-4.1 |
| 65 |
>=sys-libs/zlib-1.2.3 |
| 66 |
!dev-db/mariadb-native-client[mysqlcompat] |
| 67 |
" |
| 68 |
|
| 69 |
+# dev-db/mysql-5.7.3+ only works with dev-libs/libedit |
| 70 |
+if [[ ${PN} == "mysql" ]] && mysql_version_is_at_least "5.7.3" ; then |
| 71 |
+ DEPEND="${DEPEND} dev-libs/libedit" |
| 72 |
+else |
| 73 |
+ DEPEND="${DEPEND} >=sys-libs/readline-4.1" |
| 74 |
+fi |
| 75 |
+ |
| 76 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 77 |
mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" |
| 78 |
mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" |
Archives