commit: 90500da3ac92f0cc99059cb366583f74b5f4f48d Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Tue Jul 28 22:27:52 2015 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Tue Jul 28 22:27:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=90500da3
Sync multilib fix and headers from portage eclass/mysql-multilib.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index d8bb0a6..a7d3c31 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.21 2015/06/10 18:08:02 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.23 2015/07/28 20:51:40 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -679,7 +679,11 @@ multilib_src_configure() { configure_cmake_minimal fi else - configure_cmake_standard + if multilib_is_native_abi ; then + configure_cmake_standard + else + configure_cmake_minimal + fi fi # Always build NDB with mysql-cluster for libndbclient