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

Diff of /eclass/mysql.eclass

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

Revision 1.71 Revision 1.94
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.71 2007/03/06 15:55:55 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.94 2008/05/29 05:33:49 robbat2 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: Luca Longinotti <chtekk@gentoo.org> 7# - Luca Longinotti <chtekk@gentoo.org>
7 8# - Robin H. Johnson <robbat2@gentoo.org>
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too!
9# Note that MYSQL_VERSION_ID must be empty!
10 9
11WANT_AUTOCONF="latest" 10WANT_AUTOCONF="latest"
12WANT_AUTOMAKE="latest" 11WANT_AUTOMAKE="latest"
13 12
14inherit eutils flag-o-matic gnuconfig autotools mysql_fx 13inherit eutils flag-o-matic gnuconfig autotools mysql_fx
16# Shorten the path because the socket path length must be shorter than 107 chars 15# Shorten the path because the socket path length must be shorter than 107 chars
17# and we will run a mysql server during test phase 16# and we will run a mysql server during test phase
18S="${WORKDIR}/mysql" 17S="${WORKDIR}/mysql"
19 18
20[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" 19[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108"
20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
21 EGIT_PROJECT=mysql-extras
22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
23 inherit git
24fi
21 25
22if [[ ${PR#r} -lt 60 ]] ; then 26if [[ ${PR#r} -lt 60 ]] ; then
23 IS_BITKEEPER=0 27 IS_BITKEEPER=0
24elif [[ ${PR#r} -lt 90 ]] ; then 28elif [[ ${PR#r} -lt 90 ]] ; then
25 IS_BITKEEPER=60 29 IS_BITKEEPER=60
30# MYSQL_VERSION_ID will be: 34# MYSQL_VERSION_ID will be:
31# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 35# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
32# This is an important part, because many of the choices the MySQL ebuild will do 36# This is an important part, because many of the choices the MySQL ebuild will do
33# depend on this variable. 37# depend on this variable.
34# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 38# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
39# We also strip off upstream's trailing letter that they use to respin tarballs
35 40
36MYSQL_VERSION_ID="" 41MYSQL_VERSION_ID=""
42tpv="${PV%[a-z]}"
37tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 43tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
38for vatom in 0 1 2 3 ; do 44for vatom in 0 1 2 3 ; do
39 # pad to length 2 45 # pad to length 2
40 tpv[${vatom}]="00${tpv[${vatom}]}" 46 tpv[${vatom}]="00${tpv[${vatom}]}"
41 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 47 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
42done 48done
43# strip leading "0" (otherwise it's considered an octal number by BASH) 49# strip leading "0" (otherwise it's considered an octal number by BASH)
44MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 50MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
45 51
46# Be warned, *DEPEND are version-dependant 52# Be warned, *DEPEND are version-dependant
53# These are used for both runtime and compiletime
47DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 54DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
48 userland_GNU? ( sys-process/procps ) 55 userland_GNU? ( sys-process/procps )
49 >=sys-apps/sed-4 56 >=sys-apps/sed-4
50 >=sys-apps/texinfo-4.7-r1 57 >=sys-apps/texinfo-4.7-r1
51 >=sys-libs/readline-4.1 58 >=sys-libs/readline-4.1
55for i in "" "-community" ; do 62for i in "" "-community" ; do
56 [[ "${i}" == ${PN#mysql} ]] || 63 [[ "${i}" == ${PN#mysql} ]] ||
57 DEPEND="${DEPEND} !dev-db/mysql${i}" 64 DEPEND="${DEPEND} !dev-db/mysql${i}"
58done 65done
59 66
67RDEPEND="${DEPEND}
68 !minimal? ( dev-db/mysql-init-scripts )
69 selinux? ( sec-policy/selinux-mysql )"
70
71# compile-time-only
60mysql_version_is_at_least "5.1" \ 72mysql_version_is_at_least "5.1" \
61|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 73|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
62 74
75# compile-time-only
63mysql_version_is_at_least "5.1.12" \ 76mysql_version_is_at_least "5.1.12" \
64&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 77&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"
65 78
79# BitKeeper dependency, compile-time only
80[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
81
82
66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 83# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 84PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68 85
69# BitKeeper dependency, compile-time only 86# Work out the default SERVER_URI correctly
70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 87if [ -z "${SERVER_URI}" ]; then
88 # The community build is on the mirrors
89 if [ "${PN}" == "mysql-community" ]; then
90 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
91 # The enterprise source is on the primary site only
92 elif [ "${PN}" == "mysql" ]; then
93 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
94 fi
95fi
71 96
72# Define correct SRC_URIs 97# Define correct SRC_URIs
73SRC_URI="${SERVER_URI} 98SRC_URI="${SERVER_URI}"
99
100[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
101 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
74 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 102 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
75mysql_version_is_at_least "5.1.12" \ 103mysql_version_is_at_least "5.1.12" \
76&& [[ -n "${PBXT_VERSION}" ]] \ 104&& [[ -n "${PBXT_VERSION}" ]] \
77&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 105&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
78 106
79DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 107DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
80HOMEPAGE="http://www.mysql.com/" 108HOMEPAGE="http://www.mysql.com/"
81LICENSE="GPL-2" 109LICENSE="GPL-2"
82SLOT="0" 110SLOT="0"
83IUSE="big-tables debug embedded minimal perl selinux ssl static" 111IUSE="big-tables debug embedded minimal perl selinux ssl static"
84RESTRICT="confcache"
85 112
86mysql_version_is_at_least "4.1" \ 113mysql_version_is_at_least "4.1" \
87&& IUSE="${IUSE} latin1" 114&& IUSE="${IUSE} latin1"
88 115
89mysql_version_is_at_least "4.1.3" \ 116mysql_version_is_at_least "4.1.3" \
101mysql_version_is_at_least "5.1" \ 128mysql_version_is_at_least "5.1" \
102|| IUSE="${IUSE} berkdb" 129|| IUSE="${IUSE} berkdb"
103 130
104mysql_version_is_at_least "5.1.12" \ 131mysql_version_is_at_least "5.1.12" \
105&& IUSE="${IUSE} pbxt" 132&& IUSE="${IUSE} pbxt"
106
107RDEPEND="${DEPEND}
108 !minimal? ( dev-db/mysql-init-scripts )
109 selinux? ( sec-policy/selinux-mysql )"
110 133
111EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 134EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
112 pkg_postinst pkg_config pkg_postrm 135 pkg_postinst pkg_config pkg_postrm
113 136
114# 137#
197 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 220 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
198 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 221 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
199 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 222 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
200 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 223 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
201 224
202 if [[ -z "${DATADIR}" ]] ; then 225 if [[ -z "${MY_DATADIR}" ]] ; then
203 DATADIR="" 226 MY_DATADIR=""
204 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 227 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
205 DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 228 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
206 | sed -ne '/datadir/s|^--datadir=||p' \ 229 | sed -ne '/datadir/s|^--datadir=||p' \
207 | tail -n1` 230 | tail -n1`
208 if [[ -z "${DATADIR}" ]] ; then 231 if [[ -z "${MY_DATADIR}" ]] ; then
209 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 232 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
210 | sed -e 's/.*=\s*//'` 233 | sed -e 's/.*=\s*//' \
234 | tail -n1`
211 fi 235 fi
212 fi 236 fi
213 if [[ -z "${DATADIR}" ]] ; then 237 if [[ -z "${MY_DATADIR}" ]] ; then
214 DATADIR="${MY_LOCALSTATEDIR}" 238 MY_DATADIR="${MY_LOCALSTATEDIR}"
215 einfo "Using default DATADIR" 239 einfo "Using default MY_DATADIR"
216 fi 240 fi
217 elog "MySQL DATADIR is ${DATADIR}" 241 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
218 242
219 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 243 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
220 if [[ -e "${DATADIR}" ]] ; then 244 if [[ -e "${MY_DATADIR}" ]] ; then
221 elog "Previous datadir found, it's YOUR job to change" 245 elog "Previous datadir found, it's YOUR job to change"
222 elog "ownership and take care of it" 246 elog "ownership and take care of it"
223 PREVIOUS_DATADIR="yes" 247 PREVIOUS_DATADIR="yes"
224 else 248 else
225 PREVIOUS_DATADIR="no" 249 PREVIOUS_DATADIR="no"
231 MY_SOURCEDIR=${SERVER_URI##*/} 255 MY_SOURCEDIR=${SERVER_URI##*/}
232 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 256 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
233 257
234 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 258 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
235 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 259 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
236 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 260 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
237} 261}
238 262
239configure_minimal() { 263configure_minimal() {
240 # These are things we exclude from a minimal build, please 264 # These are things we exclude from a minimal build, please
241 # note that the server actually does get built and installed, 265 # note that the server actually does get built and installed,
242 # but we then delete it before packaging. 266 # but we then delete it before packaging.
243 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 267 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
244 268
245 for i in ${minimal_exclude_list} ; do 269 for i in ${minimal_exclude_list} ; do
246 myconf="${myconf} --without-${i}" 270 myconf="${myconf} --without-${i}"
247 done 271 done
248 myconf="${myconf} --with-extra-charsets=none" 272 myconf="${myconf} --with-extra-charsets=none"
249 myconf="${myconf} --enable-local-infile" 273 myconf="${myconf} --enable-local-infile"
250 274
251 if use static ; then 275 if use static ; then
252 myconf="${myconf} --with-client-ldflags=-all-static" 276 myconf="${myconf} --with-client-ldflags=-all-static"
253 myconf="${myconf} --disable-shared" 277 myconf="${myconf} --disable-shared --with-pic"
254 else 278 else
255 myconf="${myconf} --enable-shared --enable-static" 279 myconf="${myconf} --enable-shared --enable-static"
256 fi 280 fi
257 281
258 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 282 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
274 myconf="${myconf} --without-libwrap" 298 myconf="${myconf} --without-libwrap"
275 299
276 if use static ; then 300 if use static ; then
277 myconf="${myconf} --with-mysqld-ldflags=-all-static" 301 myconf="${myconf} --with-mysqld-ldflags=-all-static"
278 myconf="${myconf} --with-client-ldflags=-all-static" 302 myconf="${myconf} --with-client-ldflags=-all-static"
279 myconf="${myconf} --disable-shared" 303 myconf="${myconf} --disable-shared --with-pic"
280 else 304 else
281 myconf="${myconf} --enable-shared --enable-static" 305 myconf="${myconf} --enable-shared --enable-static"
282 fi 306 fi
283 307
284 if use debug ; then 308 if use debug ; then
326 myconf="${myconf} $(use_with ssl)" 350 myconf="${myconf} $(use_with ssl)"
327 else 351 else
328 myconf="${myconf} $(use_with ssl openssl)" 352 myconf="${myconf} $(use_with ssl openssl)"
329 fi 353 fi
330 354
355 if use berkdb ; then
331 # The following fix is due to a bug with bdb on SPARC's. See: 356 # The following fix is due to a bug with bdb on SPARC's. See:
332 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 357 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
333 # It comes down to non-64-bit safety problems. 358 # It comes down to non-64-bit safety problems.
334 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 359 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
335 elog "Berkeley DB support was disabled due to incompatible arch" 360 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
361 myconf="${myconf} --without-berkeley-db"
362 else
363 myconf="${myconf} --with-berkeley-db=./bdb"
364 fi
365 else
336 myconf="${myconf} --without-berkeley-db" 366 myconf="${myconf} --without-berkeley-db"
337 else
338 if use berkdb ; then
339 myconf="${myconf} --with-berkeley-db=./bdb"
340 else
341 myconf="${myconf} --without-berkeley-db"
342 fi
343 fi 367 fi
344 368
345 if mysql_version_is_at_least "4.1.3" ; then 369 if mysql_version_is_at_least "4.1.3" ; then
346 myconf="${myconf} --with-geometry" 370 myconf="${myconf} --with-geometry"
347 myconf="${myconf} $(use_with cluster ndbcluster)" 371 myconf="${myconf} $(use_with cluster ndbcluster)"
440} 464}
441 465
442# 466#
443# EBUILD FUNCTIONS 467# EBUILD FUNCTIONS
444# 468#
445
446mysql_pkg_setup() { 469mysql_pkg_setup() {
447 enewgroup mysql 60 || die "problem adding 'mysql' group" 470 if hasq test ${FEATURES} ; then
448 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 471 if ! use minimal ; then
472 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 fi
475 fi
476 fi
477
478 # Bug #213475 - MySQL _will_ object strenously if your machine is named
479 # localhost. Also causes weird failures.
480 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
449 481
450 # Check for USE flag problems in pkg_setup 482 # Check for USE flag problems in pkg_setup
451 if use static && use ssl ; then 483 if use static && use ssl ; then
452 eerror "MySQL does not support being built statically with SSL support enabled!" 484 eerror "MySQL does not support being built statically with SSL support enabled!"
453 die "MySQL does not support being built statically with SSL support enabled!" 485 die "MySQL does not support being built statically with SSL support enabled!"
465 && ( use cluster || use extraengine ) \ 497 && ( use cluster || use extraengine ) \
466 && use minimal ; then 498 && use minimal ; then
467 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 499 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
468 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 500 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 fi 501 fi
502
503 # This should come after all of the die statements
504 enewgroup mysql 60 || die "problem adding 'mysql' group"
505 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
470 506
471 mysql_check_version_range "4.0 to 5.0.99.99" \ 507 mysql_check_version_range "4.0 to 5.0.99.99" \
472 && use berkdb \ 508 && use berkdb \
473 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 509 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
474} 510}
476mysql_src_unpack() { 512mysql_src_unpack() {
477 # Initialize the proper variables first 513 # Initialize the proper variables first
478 mysql_init_vars 514 mysql_init_vars
479 515
480 unpack ${A} 516 unpack ${A}
517 # Grab the patches
518 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
519 # Bitkeeper checkout support
481 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 520 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
482 if mysql_check_version_range "5.1 to 5.1.99" ; then 521 if mysql_check_version_range "5.1 to 5.1.99" ; then
483 bitkeeper_fetch "mysql-5.1-ndb" 522 bitkeeper_fetch "mysql-5.1-ndb"
484 elif mysql_check_version_range "5.2 to 5.2.99" ; then 523 elif mysql_check_version_range "5.2 to 5.2.99" ; then
485 bitkeeper_fetch "mysql-5.2-falcon" 524 bitkeeper_fetch "mysql-5.2-falcon"
495 fi 534 fi
496 535
497 # Apply the patches for this MySQL version 536 # Apply the patches for this MySQL version
498 EPATCH_SUFFIX="patch" 537 EPATCH_SUFFIX="patch"
499 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 538 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
539 # Clean out old items
540 rm -f "${EPATCH_SOURCE}"/*
541 # Now link in right patches
500 mysql_mv_patches 542 mysql_mv_patches
543 # And apply
501 epatch 544 epatch
502 545
503 # Additional checks, remove bundled zlib 546 # Additional checks, remove bundled zlib
504 rm -f "${S}/zlib/"*.[ch] 547 rm -f "${S}/zlib/"*.[ch]
505 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 548 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
521 564
522 local rebuilddirlist d 565 local rebuilddirlist d
523 566
524 if mysql_version_is_at_least "5.1.12" ; then 567 if mysql_version_is_at_least "5.1.12" ; then
525 rebuilddirlist="." 568 rebuilddirlist="."
526 # TODO: check this with a cmake expert 569 # TODO: check this with a cmake expert
527 use innodb \ 570 use innodb \
528 && cmake \ 571 && cmake \
529 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 572 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
530 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 573 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
531 "storage/innobase" 574 "storage/innobase"
532 else 575 else
533 rebuilddirlist=". innobase" 576 rebuilddirlist=". innobase"
534 fi 577 fi
535 578
644 else 687 else
645 mysql_mycnf_version="4.0" 688 mysql_mycnf_version="4.0"
646 fi 689 fi
647 insinto "${MY_SYSCONFDIR}" 690 insinto "${MY_SYSCONFDIR}"
648 doins scripts/mysqlaccess.conf 691 doins scripts/mysqlaccess.conf
649 sed -e "s!@DATADIR@!${DATADIR}!g" \ 692 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
650 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 693 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
651 > "${TMPDIR}/my.cnf.ok" 694 > "${TMPDIR}/my.cnf.ok"
652 if mysql_version_is_at_least "4.1" && use latin1 ; then 695 if mysql_version_is_at_least "4.1" && use latin1 ; then
653 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 696 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
654 fi 697 fi
657 # Minimal builds don't have the MySQL server 700 # Minimal builds don't have the MySQL server
658 if ! use minimal ; then 701 if ! use minimal ; then
659 # Empty directories ... 702 # Empty directories ...
660 diropts "-m0750" 703 diropts "-m0750"
661 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 704 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
662 dodir "${DATADIR}" 705 dodir "${MY_DATADIR}"
663 keepdir "${DATADIR}" 706 keepdir "${MY_DATADIR}"
664 chown -R mysql:mysql "${D}/${DATADIR}" 707 chown -R mysql:mysql "${D}/${MY_DATADIR}"
665 fi 708 fi
666 709
667 diropts "-m0755" 710 diropts "-m0755"
668 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 711 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
669 dodir "${folder}" 712 dodir "${folder}"
672 done 715 done
673 fi 716 fi
674 717
675 # Docs 718 # Docs
676 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 719 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
720 doinfo "${S}"/Docs/mysql.info
677 721
678 # Minimal builds don't have the MySQL server 722 # Minimal builds don't have the MySQL server
679 if ! use minimal ; then 723 if ! use minimal ; then
680 docinto "support-files" 724 docinto "support-files"
681 for script in \ 725 for script in \
682 support-files/my-*.cnf \ 726 "${S}"/support-files/my-*.cnf \
683 support-files/magic \ 727 "${S}"/support-files/magic \
684 support-files/ndb-config-2-node.ini 728 "${S}"/support-files/ndb-config-2-node.ini
685 do 729 do
686 dodoc "${script}" 730 dodoc "${script}"
687 done 731 done
688 732
689 docinto "scripts" 733 docinto "scripts"
690 for script in scripts/mysql* ; do 734 for script in "${S}"/scripts/mysql* ; do
691 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 735 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
692 done 736 done
737
693 fi 738 fi
694 739
695 mysql_lib_symlinks "${D}" 740 mysql_lib_symlinks "${D}"
696} 741}
697 742
757 802
758mysql_pkg_config() { 803mysql_pkg_config() {
759 # Make sure the vars are correctly initialized 804 # Make sure the vars are correctly initialized
760 mysql_init_vars 805 mysql_init_vars
761 806
762 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 807 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
763 808
764 if built_with_use ${CATEGORY}/${PN} minimal ; then 809 if built_with_use ${CATEGORY}/${PN} minimal ; then
765 die "Minimal builds do NOT include the MySQL server" 810 die "Minimal builds do NOT include the MySQL server"
766 fi 811 fi
767 812
768 local pwd1="a" 813 local pwd1="a"
769 local pwd2="b" 814 local pwd2="b"
770 local maxtry=5 815 local maxtry=5
771 816
772 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 817 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
773 ewarn "You have already a MySQL database in place." 818 ewarn "You have already a MySQL database in place."
774 ewarn "(${ROOT}/${DATADIR}/*)" 819 ewarn "(${ROOT}/${MY_DATADIR}/*)"
775 ewarn "Please rename or delete it if you wish to replace it." 820 ewarn "Please rename or delete it if you wish to replace it."
776 die "MySQL database already exists!" 821 die "MySQL database already exists!"
777 fi 822 fi
778 823
779 einfo "Creating the mysql database and setting proper" 824 einfo "Creating the mysql database and setting proper"
798 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 843 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
799 || touch "${TMPDIR}/fill_help_tables.sql" 844 || touch "${TMPDIR}/fill_help_tables.sql"
800 help_tables="${TMPDIR}/fill_help_tables.sql" 845 help_tables="${TMPDIR}/fill_help_tables.sql"
801 846
802 pushd "${TMPDIR}" &>/dev/null 847 pushd "${TMPDIR}" &>/dev/null
803 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 848 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
849 if [ $? -ne 0 ]; then
850 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
851 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
852 fi
804 popd &>/dev/null 853 popd &>/dev/null
805 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 854 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
806 || die "MySQL databases not installed" 855 || die "MySQL databases not installed"
807 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 856 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
808 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 857 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
809 858
810 if mysql_version_is_at_least "4.1.3" ; then 859 if mysql_version_is_at_least "4.1.3" ; then
811 options="--skip-ndbcluster" 860 options="--skip-ndbcluster"
812 861
813 # Filling timezones, see 862 # Filling timezones, see
824 local mysqld="${ROOT}/usr/sbin/mysqld \ 873 local mysqld="${ROOT}/usr/sbin/mysqld \
825 ${options} \ 874 ${options} \
826 --user=mysql \ 875 --user=mysql \
827 --skip-grant-tables \ 876 --skip-grant-tables \
828 --basedir=${ROOT}/usr \ 877 --basedir=${ROOT}/usr \
829 --datadir=${ROOT}/${DATADIR} \ 878 --datadir=${ROOT}/${MY_DATADIR} \
830 --skip-innodb \ 879 --skip-innodb \
831 --skip-bdb \ 880 --skip-bdb \
832 --skip-networking \ 881 --skip-networking \
833 --max_allowed_packet=8M \ 882 --max_allowed_packet=8M \
834 --net_buffer_length=16K \ 883 --net_buffer_length=16K \

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

  ViewVC Help
Powered by ViewVC 1.1.20