diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-02-10 18:14:23 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-02-10 18:14:23 +0000 |
| commit | d79f99efbd1278c29d94149e52f0f80848ce66ef (patch) | |
| tree | f72e62a3f15f6e61fa6bdfef542b52531e0f2100 /eclass | |
| parent | version bump (diff) | |
| download | gentoo-2-d79f99efbd1278c29d94149e52f0f80848ce66ef.tar.gz gentoo-2-d79f99efbd1278c29d94149e52f0f80848ce66ef.tar.bz2 gentoo-2-d79f99efbd1278c29d94149e52f0f80848ce66ef.zip | |
mysql-multilib.eclass: Always build NDB with mysql-cluster for libndbclient
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ae8ddc368b7f..f31be51c8069 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.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 4a2fbe340f61..a8829ffc8f09 100644 --- 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]" |