mysql-multilib.eclass: Always build NDB with mysql-cluster for libndbclient

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index ae8ddc368b7f454c9ecdb75ef4a33b5237e0d373..f31be51c8069f606291acc9c0adfec32fbc908fe 100644 (file)
--- 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.1527 2015/02/10 07:22:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1528 2015/02/10 18:14:23 grknight Exp $
+
+  10 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Always build NDB with mysql-cluster for libndbclient
 
   10 Feb 2015; Justin Lecher <jlec@gentoo.org> toolchain.eclass:
   Revert unreviewed commit which breaks the tree

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 4a2fbe340f6185535dae480820ba545704a6498d..a8829ffc8f09d97239fc41a8bd778cd8036c8492 100644 (file)
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.13 2015/02/08 22:03:56 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.14 2015/02/10 18:14:23 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -393,6 +393,9 @@ PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h )
 
+[[ ${PN} == "mysql-cluster" ]] && \
+       MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h )
+
 [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "10.1.1" && \
        MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
 
@@ -562,6 +565,11 @@ multilib_src_configure() {
                configure_cmake_minimal
        fi
 
+       # Always build NDB with mysql-cluster for libndbclient
+       [[ ${PN} == "mysql-cluster" ]] && mycmakeargs+=(
+               -DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
+               -DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
+
        # Bug #114895, bug #110149
        filter-flags "-O" "-O[01]"