grknight 15/02/10 18:14:23 Modified: ChangeLog mysql-multilib.eclass Log: mysql-multilib.eclass: Always build NDB with mysql-cluster for libndbclient
Revision Changes Path 1.1528 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1528&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1528&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1527&r2=1.1528 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1527 retrieving revision 1.1528 diff -u -r1.1527 -r1.1528 --- ChangeLog 10 Feb 2015 07:22:00 -0000 1.1527 +++ ChangeLog 10 Feb 2015 18:14:23 -0000 1.1528 @@ -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 <[email protected]> mysql-multilib.eclass: + Always build NDB with mysql-cluster for libndbclient 10 Feb 2015; Justin Lecher <[email protected]> toolchain.eclass: Revert unreviewed commit which breaks the tree 1.14 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.13&r2=1.14 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mysql-multilib.eclass 8 Feb 2015 22:03:56 -0000 1.13 +++ mysql-multilib.eclass 10 Feb 2015 18:14:23 -0000 1.14 @@ -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 @@ # 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 @@ 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]"
