[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit:     cf4624ec566ad67130b74e1df009068a3e29822b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  8 19:25:29 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct  8 19:25:29 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=cf4624ec

Skip gcc version checks on binary merges

---
 eclass/mysql-multilib.eclass | 3 ++-
 eclass/mysql-v2.eclass       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 5f42d4e..079c86f 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -393,7 +393,8 @@ 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-major-version) -lt 4 || 
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
+       if use_if_iuse tokudb && [[ "${MERGE_TYPE}" != "binary" && 
$(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 24e3996..f4a772b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -515,7 +515,8 @@ 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-major-version) -lt 4 || 
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
+       if use_if_iuse tokudb && [[ "${MERGE_TYPE}" != "binary" && 
$(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