/[gentoo-x86]/eclass/mysql.eclass
Gentoo

Diff of /eclass/mysql.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.94 Revision 1.97
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2007 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.94 2008/05/29 05:33:49 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.97 2008/10/16 18:48:42 betelgeuse Exp $
4 4
5# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 5# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
6# Maintainer: MySQL Team <mysql-bugs@gentoo.org> 6# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
7# - Luca Longinotti <chtekk@gentoo.org> 7# - Luca Longinotti <chtekk@gentoo.org>
8# - Robin H. Johnson <robbat2@gentoo.org> 8# - Robin H. Johnson <robbat2@gentoo.org>
240 fi 240 fi
241 elog "MySQL MY_DATADIR is ${MY_DATADIR}" 241 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
242 242
243 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 243 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
244 if [[ -e "${MY_DATADIR}" ]] ; then 244 if [[ -e "${MY_DATADIR}" ]] ; then
245 elog "Previous datadir found, it's YOUR job to change" 245 # If you get this and you're wondering about it, see bug #207636
246 elog "ownership and take care of it" 246 elog "MySQL datadir found in ${MY_DATADIR}"
247 elog "A new one will not be created."
247 PREVIOUS_DATADIR="yes" 248 PREVIOUS_DATADIR="yes"
248 else 249 else
249 PREVIOUS_DATADIR="no" 250 PREVIOUS_DATADIR="no"
250 fi 251 fi
251 export PREVIOUS_DATADIR 252 export PREVIOUS_DATADIR
468# 469#
469mysql_pkg_setup() { 470mysql_pkg_setup() {
470 if hasq test ${FEATURES} ; then 471 if hasq test ${FEATURES} ; then
471 if ! use minimal ; then 472 if ! use minimal ; then
472 if [[ $UID -eq 0 ]]; then 473 if [[ $UID -eq 0 ]]; then
473 die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." 474 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
474 fi 475 fi
475 fi 476 fi
476 fi 477 fi
477 478
478 # Bug #213475 - MySQL _will_ object strenously if your machine is named 479 # Bug #213475 - MySQL _will_ object strenously if your machine is named
586 if mysql_check_version_range "4.1 to 5.0.99.99" \ 587 if mysql_check_version_range "4.1 to 5.0.99.99" \
587 && use berkdb ; then 588 && use berkdb ; then
588 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 589 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
589 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 590 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
590 || die "Could not copy libtool.m4 to bdb/dist/" 591 || die "Could not copy libtool.m4 to bdb/dist/"
592 #These files exist only with libtool-2*, and need to be included.
593 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
594 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
595 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
596 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
597 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
598 fi
591 pushd "bdb/dist" &>/dev/null 599 pushd "bdb/dist" &>/dev/null
592 sh s_all \ 600 sh s_all \
593 || die "Failed bdb reconfigure" 601 || die "Failed bdb reconfigure"
594 popd &>/dev/null 602 popd &>/dev/null
595 fi 603 fi

Legend:
Removed from v.1.94  
changed lines
  Added in v.1.97

  ViewVC Help
Powered by ViewVC 1.1.20