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

[Brian Evans]

commit:     f051ae75402763b80bd9a10a44a6b75dd2f34426
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 17:44:14 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 17:44:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f051ae75

Fix compatibilty with old builds for building the server

 eclass/mysql-multilib.eclass | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 4385728..d8bb0a6 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -672,10 +672,14 @@ multilib_src_configure() {
 
        if use_if_iuse minimal ; then
                configure_cmake_minimal
-       elif multilib_is_native_abi && use_if_iuse server ; then
-               configure_cmake_standard
+       elif in_iuse server ; then
+               if multilib_is_native_abi && use server ; then
+                       configure_cmake_standard
+               else
+                       configure_cmake_minimal
+               fi
        else
-               configure_cmake_minimal
+               configure_cmake_standard
        fi
 
        # Always build NDB with mysql-cluster for libndbclient