diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-07-30 20:34:57 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-07-30 20:34:57 +0000 |
| commit | d71a8aab36914f153361cfa7f9a5473981fa0c26 (patch) | |
| tree | 4b6195f0b142337fa24861df7225d05254d8492b /eclass | |
| parent | Add go-spew. (diff) | |
| download | historical-d71a8aab36914f153361cfa7f9a5473981fa0c26.tar.gz historical-d71a8aab36914f153361cfa7f9a5473981fa0c26.tar.bz2 historical-d71a8aab36914f153361cfa7f9a5473981fa0c26.zip | |
Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra defines in the ebuild
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 36 |
2 files changed, 30 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ac9d6fe62941..0482c95f2bc9 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1738 2015/07/30 14:04:41 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1739 2015/07/30 20:34:57 grknight Exp $ + + 30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass: + Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra + defines in the ebuild 30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass: Reset variables between ABIs diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 707280e943b2..f48024d04588 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.26 2015/07/30 14:04:41 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.27 2015/07/30 20:34:57 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -45,6 +45,18 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_ # VARIABLES: # +# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES +# @DESCRIPTION: +# Add extra CMake arguments for native multilib builds + +# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES +# @DESCRIPTION: +# Add extra CMake arguments for non-native multilib builds + +# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES +# @DESCRIPTION: +# Add extra CMake arguments + # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase S="${WORKDIR}/mysql" @@ -589,7 +601,7 @@ multilib_src_configure() { fi # debug hack wrt #497532 - mycmakeargs+=( + mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr @@ -624,13 +636,6 @@ multilib_src_configure() { -DWITH_DEFAULT_FEATURE_SET=0 ) - # systemtap only works on native ABI bug 530132 - if multilib_is_native_abi; then - mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) - else - mycmakeargs+=( -DENABLE_DTRACE=0 ) - fi - if in_iuse client-libs ; then mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) ) fi @@ -687,14 +692,23 @@ multilib_src_configure() { fi fi + # systemtap only works on native ABI bug 530132 + if multilib_is_native_abi; then + mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) + [[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NATIVE_DEFINES} ) + else + mycmakeargs+=( -DENABLE_DTRACE=0 ) + [[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NONNATIVE_DEFINES} ) + fi + + [[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_EXTRA_DEFINES} ) + # 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 ) cmake-utils_src_configure - # Reset for each ABI - mycmakeargs=( ) } mysql-multilib_src_compile() { |