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

Diff of /eclass/mysql-v2.eclass

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

Revision 1.8 Revision 1.9
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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-v2.eclass,v 1.8 2011/09/25 12:43:28 grobian Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/07 04:30:18 jmbsvicetto Exp $
4 4
5# @ECLASS: mysql-v2.eclass 5# @ECLASS: mysql-v2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Maintainers: 7# Maintainers:
8# - MySQL Team <mysql-bugs@gentoo.org> 8# - MySQL Team <mysql-bugs@gentoo.org>
41MYSQL_EXTRAS="" 41MYSQL_EXTRAS=""
42 42
43# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER 43# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
44# @DESCRIPTION: 44# @DESCRIPTION:
45# The version of the MYSQL_EXTRAS repo to use to build mysql 45# The version of the MYSQL_EXTRAS repo to use to build mysql
46# Use "none" to disable it's use
46[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git-2" 47[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git-2"
47 48
48inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs 49inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
49 50
50# 51#
172 173
173# Define correct SRC_URIs 174# Define correct SRC_URIs
174SRC_URI="${SERVER_URI}" 175SRC_URI="${SERVER_URI}"
175 176
176# Gentoo patches to MySQL 177# Gentoo patches to MySQL
177[[ ${MY_EXTRAS_VER} != live ]] \ 178[[ ${MY_EXTRAS_VER} != live ]] && [[ ${MY_EXTRAS_VER} != none ]] \
178&& SRC_URI="${SRC_URI} 179&& SRC_URI="${SRC_URI}
179 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 180 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
180 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 181 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
181 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 182 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
182 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 183 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
233 234
234# Be warned, *DEPEND are version-dependant 235# Be warned, *DEPEND are version-dependant
235# These are used for both runtime and compiletime 236# These are used for both runtime and compiletime
236DEPEND=" 237DEPEND="
237 ssl? ( >=dev-libs/openssl-0.9.6d ) 238 ssl? ( >=dev-libs/openssl-0.9.6d )
238 userland_GNU? ( sys-process/procps ) 239 kernel_linux? ( sys-process/procps )
239 >=sys-apps/sed-4 240 >=sys-apps/sed-4
240 >=sys-apps/texinfo-4.7-r1 241 >=sys-apps/texinfo-4.7-r1
241 >=sys-libs/readline-4.1 242 >=sys-libs/readline-4.1
242 >=sys-libs/zlib-1.2.3 243 >=sys-libs/zlib-1.2.3
243" 244"
637 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 638 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
638 || touch "${TMPDIR}/fill_help_tables.sql" 639 || touch "${TMPDIR}/fill_help_tables.sql"
639 help_tables="${TMPDIR}/fill_help_tables.sql" 640 help_tables="${TMPDIR}/fill_help_tables.sql"
640 641
641 pushd "${TMPDIR}" &>/dev/null 642 pushd "${TMPDIR}" &>/dev/null
642 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1 643 "${ROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${TMPDIR}"/mysql_install_db.log 2>&1
643 if [ $? -ne 0 ]; then 644 if [ $? -ne 0 ]; then
644 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 645 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
645 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" 646 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
646 fi 647 fi
647 popd &>/dev/null 648 popd &>/dev/null

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9

  ViewVC Help
Powered by ViewVC 1.1.20