grknight 15/07/30 20:34:57 Modified: ChangeLog mysql-multilib.eclass Log: Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra defines in the ebuild
Revision Changes Path 1.1739 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1739&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1739&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1738&r2=1.1739 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1738 retrieving revision 1.1739 diff -u -r1.1738 -r1.1739 --- ChangeLog 30 Jul 2015 14:04:41 -0000 1.1738 +++ ChangeLog 30 Jul 2015 20:34:57 -0000 1.1739 @@ -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 <[email protected]> mysql-multilib.eclass: + Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra + defines in the ebuild 30 Jul 2015; Brian Evans <[email protected]> mysql-multilib.eclass: Reset variables between ABIs 1.27 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.27&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.27&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.26&r2=1.27 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mysql-multilib.eclass 30 Jul 2015 14:04:41 -0000 1.26 +++ mysql-multilib.eclass 30 Jul 2015 20:34:57 -0000 1.27 @@ -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 @@ # 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 @@ 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 @@ -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 @@ 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() {
