commit: 40af541360ce070aa32ae5249695c46f4818048d
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Apr 23 13:18:14 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Apr 23 13:18:14 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=40af5413
[eclass] Fix potential issue for future gcc versions in pkg_setup
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>
---
eclass/mysql-multilib.eclass | 2 +-
eclass/mysql-v2.eclass | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index e2dd614..9a2f94c 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -347,7 +347,7 @@ mysql-multilib_pkg_setup() {
mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
fi
- if use_if_iuse tokudb && [[ $(gcc-version) < 4.7 ]] ; then
+ if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 ||
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
eerror "${PN} with tokudb needs to be built with gcc-4.7 or
later."
eerror "Please use gcc-config to switch to gcc-4.7 or later
version."
die
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 879ff9b..1830130 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -479,7 +479,7 @@ mysql-v2_pkg_setup() {
mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
fi
- if use_if_iuse tokudb && [[ $(gcc-version) < 4.7 ]] ; then
+ if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 ||
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
eerror "${PN} with tokudb needs to be built with gcc-4.7 or
later."
eerror "Please use gcc-config to switch to gcc-4.7 or later
version."
die
