grknight    15/07/28 20:51:40

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Fix configuring non-native abi which leads to build failure wrt bug 556162

Revision  Changes    Path
1.1735               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1735&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1735&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1734&r2=1.1735

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1734
retrieving revision 1.1735
diff -u -r1.1734 -r1.1735
--- ChangeLog   28 Jul 2015 01:58:13 -0000      1.1734
+++ ChangeLog   28 Jul 2015 20:51:40 -0000      1.1735
@@ -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 <[email protected]> mysql-multilib.eclass:
+  Fix configuring non-native abi which leads to build failure wrt bug 556162
 
   28 Jul 2015; Brian Evans <[email protected]> mysql-cmake.eclass,
   mysql-multilib.eclass:



1.23                 eclass/mysql-multilib.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.23&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.23&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.22&r2=1.23

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mysql-multilib.eclass       28 Jul 2015 01:58:13 -0000      1.22
+++ mysql-multilib.eclass       28 Jul 2015 20:51:40 -0000      1.23
@@ -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 @@
                        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




Reply via email to