summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/mysql-multilib.eclass8
2 files changed, 10 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index a2af454c3b4f..dcc6028dd22a 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1734 2015/07/28 01:58:13 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1735 2015/07/28 20:51:40 grknight Exp $
+
+ 28 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+ Fix configuring non-native abi which leads to build failure wrt bug 556162
28 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-cmake.eclass,
mysql-multilib.eclass:
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1adc12c07775..a7d3c31152fb 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.22 2015/07/28 01:58:13 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