grknight 15/07/29 15:01:43 Modified: ChangeLog mysql-multilib.eclass Log: Fix pkg_config function error with non-existant USE flags
Revision Changes Path 1.1736 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1736&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1736&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1735&r2=1.1736 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1735 retrieving revision 1.1736 diff -u -r1.1735 -r1.1736 --- ChangeLog 28 Jul 2015 20:51:40 -0000 1.1735 +++ ChangeLog 29 Jul 2015 15:01:43 -0000 1.1736 @@ -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.1735 2015/07/28 20:51:40 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1736 2015/07/29 15:01:43 grknight Exp $ + + 29 Jul 2015; Brian Evans <[email protected]> mysql-multilib.eclass: + Fix pkg_config function error with non-existant USE flags 28 Jul 2015; Brian Evans <[email protected]> mysql-multilib.eclass: Fix configuring non-native abi which leads to build failure wrt bug 556162 1.24 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.23&r2=1.24 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mysql-multilib.eclass 28 Jul 2015 20:51:40 -0000 1.23 +++ mysql-multilib.eclass 29 Jul 2015 15:01:43 -0000 1.24 @@ -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.23 2015/07/28 20:51:40 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24 2015/07/29 15:01:43 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -876,9 +876,14 @@ mysql_init_vars [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" - - if built_with_use ${CATEGORY}/${PN} minimal && ! built_with_use ${CATEGORY}/${PN} server ; then - die "Minimal builds do NOT include the MySQL server" + if [[ ${HAS_TOOLS_PATCH} ]] ; then + if ! built_with_use ${CATEGORY}/${PN} server ; then + die "Minimal builds do NOT include the MySQL server" + fi + else + if built_with_use ${CATEGORY}/${PN} minimal ; then + die "Minimal builds do NOT include the MySQL server" + fi fi if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
