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

Diff of /eclass/mysql.eclass

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

Revision 1.72 Revision 1.98
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.72 2007/03/16 22:47:29 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.98 2008/11/14 01:46:24 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 # If you get this and you're wondering about it, see bug #207636
222 elog "ownership and take care of it" 246 elog "MySQL datadir found in ${MY_DATADIR}"
247 elog "A new one will not be created."
223 PREVIOUS_DATADIR="yes" 248 PREVIOUS_DATADIR="yes"
224 else 249 else
225 PREVIOUS_DATADIR="no" 250 PREVIOUS_DATADIR="no"
226 fi 251 fi
227 export PREVIOUS_DATADIR 252 export PREVIOUS_DATADIR
231 MY_SOURCEDIR=${SERVER_URI##*/} 256 MY_SOURCEDIR=${SERVER_URI##*/}
232 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 257 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
233 258
234 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 259 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
235 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 260 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
236 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 261 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
237} 262}
238 263
239configure_minimal() { 264configure_minimal() {
240 # These are things we exclude from a minimal build, please 265 # These are things we exclude from a minimal build, please
241 # note that the server actually does get built and installed, 266 # note that the server actually does get built and installed,
242 # but we then delete it before packaging. 267 # but we then delete it before packaging.
243 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 268 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
244 269
245 for i in ${minimal_exclude_list} ; do 270 for i in ${minimal_exclude_list} ; do
246 myconf="${myconf} --without-${i}" 271 myconf="${myconf} --without-${i}"
247 done 272 done
248 myconf="${myconf} --with-extra-charsets=none" 273 myconf="${myconf} --with-extra-charsets=none"
249 myconf="${myconf} --enable-local-infile" 274 myconf="${myconf} --enable-local-infile"
250 275
251 if use static ; then 276 if use static ; then
252 myconf="${myconf} --with-client-ldflags=-all-static" 277 myconf="${myconf} --with-client-ldflags=-all-static"
253 myconf="${myconf} --disable-shared" 278 myconf="${myconf} --disable-shared --with-pic"
254 else 279 else
255 myconf="${myconf} --enable-shared --enable-static" 280 myconf="${myconf} --enable-shared --enable-static"
256 fi 281 fi
257 282
258 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 283 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
274 myconf="${myconf} --without-libwrap" 299 myconf="${myconf} --without-libwrap"
275 300
276 if use static ; then 301 if use static ; then
277 myconf="${myconf} --with-mysqld-ldflags=-all-static" 302 myconf="${myconf} --with-mysqld-ldflags=-all-static"
278 myconf="${myconf} --with-client-ldflags=-all-static" 303 myconf="${myconf} --with-client-ldflags=-all-static"
279 myconf="${myconf} --disable-shared" 304 myconf="${myconf} --disable-shared --with-pic"
280 else 305 else
281 myconf="${myconf} --enable-shared --enable-static" 306 myconf="${myconf} --enable-shared --enable-static"
282 fi 307 fi
283 308
284 if use debug ; then 309 if use debug ; then
325 if mysql_version_is_at_least "5.1.11" ; then 350 if mysql_version_is_at_least "5.1.11" ; then
326 myconf="${myconf} $(use_with ssl)" 351 myconf="${myconf} $(use_with ssl)"
327 else 352 else
328 myconf="${myconf} $(use_with ssl openssl)" 353 myconf="${myconf} $(use_with ssl openssl)"
329 fi 354 fi
330 355
356 if mysql_version_is_at_least "5.0.60" ; then
357 if use berkdb ; then
358 elog "Berkeley DB support was disabled due to build failures"
359 elog "on multiple arches, go to a version earlier than 5.0.60"
360 elog "if you want it again. Gentoo bug #224067."
361 fi
362 myconf="${myconf} --without-berkeley-db"
363 elif use berkdb ; then
331 # The following fix is due to a bug with bdb on SPARC's. See: 364 # 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 365 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
333 # It comes down to non-64-bit safety problems. 366 # It comes down to non-64-bit safety problems.
334 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 367 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
335 elog "Berkeley DB support was disabled due to incompatible arch" 368 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
369 myconf="${myconf} --without-berkeley-db"
370 else
371 myconf="${myconf} --with-berkeley-db=./bdb"
372 fi
373 else
336 myconf="${myconf} --without-berkeley-db" 374 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 375 fi
344 376
345 if mysql_version_is_at_least "4.1.3" ; then 377 if mysql_version_is_at_least "4.1.3" ; then
346 myconf="${myconf} --with-geometry" 378 myconf="${myconf} --with-geometry"
347 myconf="${myconf} $(use_with cluster ndbcluster)" 379 myconf="${myconf} $(use_with cluster ndbcluster)"
440} 472}
441 473
442# 474#
443# EBUILD FUNCTIONS 475# EBUILD FUNCTIONS
444# 476#
445
446mysql_pkg_setup() { 477mysql_pkg_setup() {
447 enewgroup mysql 60 || die "problem adding 'mysql' group" 478 if hasq test ${FEATURES} ; then
448 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 479 if ! use minimal ; then
480 if [[ $UID -eq 0 ]]; then
481 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
482 fi
483 fi
484 fi
485
486 # Bug #213475 - MySQL _will_ object strenously if your machine is named
487 # localhost. Also causes weird failures.
488 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
449 489
450 # Check for USE flag problems in pkg_setup 490 # Check for USE flag problems in pkg_setup
451 if use static && use ssl ; then 491 if use static && use ssl ; then
452 eerror "MySQL does not support being built statically with SSL support enabled!" 492 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!" 493 die "MySQL does not support being built statically with SSL support enabled!"
465 && ( use cluster || use extraengine ) \ 505 && ( use cluster || use extraengine ) \
466 && use minimal ; then 506 && use minimal ; then
467 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 507 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
468 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 508 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
469 fi 509 fi
510
511 # This should come after all of the die statements
512 enewgroup mysql 60 || die "problem adding 'mysql' group"
513 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
470 514
471 mysql_check_version_range "4.0 to 5.0.99.99" \ 515 mysql_check_version_range "4.0 to 5.0.99.99" \
472 && use berkdb \ 516 && use berkdb \
473 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 517 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
474} 518}
476mysql_src_unpack() { 520mysql_src_unpack() {
477 # Initialize the proper variables first 521 # Initialize the proper variables first
478 mysql_init_vars 522 mysql_init_vars
479 523
480 unpack ${A} 524 unpack ${A}
525 # Grab the patches
526 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
527 # Bitkeeper checkout support
481 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 528 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
482 if mysql_check_version_range "5.1 to 5.1.99" ; then 529 if mysql_check_version_range "5.1 to 5.1.99" ; then
483 bitkeeper_fetch "mysql-5.1-ndb" 530 bitkeeper_fetch "mysql-5.1-ndb"
484 elif mysql_check_version_range "5.2 to 5.2.99" ; then 531 elif mysql_check_version_range "5.2 to 5.2.99" ; then
485 bitkeeper_fetch "mysql-5.2-falcon" 532 bitkeeper_fetch "mysql-5.2-falcon"
495 fi 542 fi
496 543
497 # Apply the patches for this MySQL version 544 # Apply the patches for this MySQL version
498 EPATCH_SUFFIX="patch" 545 EPATCH_SUFFIX="patch"
499 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 546 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
547 # Clean out old items
548 rm -f "${EPATCH_SOURCE}"/*
549 # Now link in right patches
500 mysql_mv_patches 550 mysql_mv_patches
551 # And apply
501 epatch 552 epatch
502 553
503 # Additional checks, remove bundled zlib 554 # Additional checks, remove bundled zlib
504 rm -f "${S}/zlib/"*.[ch] 555 rm -f "${S}/zlib/"*.[ch]
505 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 556 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
521 572
522 local rebuilddirlist d 573 local rebuilddirlist d
523 574
524 if mysql_version_is_at_least "5.1.12" ; then 575 if mysql_version_is_at_least "5.1.12" ; then
525 rebuilddirlist="." 576 rebuilddirlist="."
526 # TODO: check this with a cmake expert 577 # TODO: check this with a cmake expert
527 use innodb \ 578 use innodb \
528 && cmake \ 579 && cmake \
529 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 580 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
530 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \ 581 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
531 "storage/innobase" 582 "storage/innobase"
532 else 583 else
533 rebuilddirlist=". innobase" 584 rebuilddirlist=". innobase"
534 fi 585 fi
535 586
543 if mysql_check_version_range "4.1 to 5.0.99.99" \ 594 if mysql_check_version_range "4.1 to 5.0.99.99" \
544 && use berkdb ; then 595 && use berkdb ; then
545 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 596 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
546 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 597 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
547 || die "Could not copy libtool.m4 to bdb/dist/" 598 || die "Could not copy libtool.m4 to bdb/dist/"
599 #These files exist only with libtool-2*, and need to be included.
600 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
601 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
602 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
603 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
604 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
605 fi
548 pushd "bdb/dist" &>/dev/null 606 pushd "bdb/dist" &>/dev/null
549 sh s_all \ 607 sh s_all \
550 || die "Failed bdb reconfigure" 608 || die "Failed bdb reconfigure"
551 popd &>/dev/null 609 popd &>/dev/null
552 fi 610 fi
644 else 702 else
645 mysql_mycnf_version="4.0" 703 mysql_mycnf_version="4.0"
646 fi 704 fi
647 insinto "${MY_SYSCONFDIR}" 705 insinto "${MY_SYSCONFDIR}"
648 doins scripts/mysqlaccess.conf 706 doins scripts/mysqlaccess.conf
649 sed -e "s!@DATADIR@!${DATADIR}!g" \ 707 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
650 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 708 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
651 > "${TMPDIR}/my.cnf.ok" 709 > "${TMPDIR}/my.cnf.ok"
652 if mysql_version_is_at_least "4.1" && use latin1 ; then 710 if mysql_version_is_at_least "4.1" && use latin1 ; then
653 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 711 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
654 fi 712 fi
657 # Minimal builds don't have the MySQL server 715 # Minimal builds don't have the MySQL server
658 if ! use minimal ; then 716 if ! use minimal ; then
659 # Empty directories ... 717 # Empty directories ...
660 diropts "-m0750" 718 diropts "-m0750"
661 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 719 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
662 dodir "${DATADIR}" 720 dodir "${MY_DATADIR}"
663 keepdir "${DATADIR}" 721 keepdir "${MY_DATADIR}"
664 chown -R mysql:mysql "${D}/${DATADIR}" 722 chown -R mysql:mysql "${D}/${MY_DATADIR}"
665 fi 723 fi
666 724
667 diropts "-m0755" 725 diropts "-m0755"
668 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 726 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
669 dodir "${folder}" 727 dodir "${folder}"
672 done 730 done
673 fi 731 fi
674 732
675 # Docs 733 # Docs
676 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 734 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
735 doinfo "${S}"/Docs/mysql.info
677 736
678 # Minimal builds don't have the MySQL server 737 # Minimal builds don't have the MySQL server
679 if ! use minimal ; then 738 if ! use minimal ; then
680 docinto "support-files" 739 docinto "support-files"
681 for script in \ 740 for script in \
682 support-files/my-*.cnf \ 741 "${S}"/support-files/my-*.cnf \
683 support-files/magic \ 742 "${S}"/support-files/magic \
684 support-files/ndb-config-2-node.ini 743 "${S}"/support-files/ndb-config-2-node.ini
685 do 744 do
686 dodoc "${script}" 745 dodoc "${script}"
687 done 746 done
688 747
689 docinto "scripts" 748 docinto "scripts"
690 for script in scripts/mysql* ; do 749 for script in "${S}"/scripts/mysql* ; do
691 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 750 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
692 done 751 done
752
693 fi 753 fi
694 754
695 mysql_lib_symlinks "${D}" 755 mysql_lib_symlinks "${D}"
696} 756}
697 757
757 817
758mysql_pkg_config() { 818mysql_pkg_config() {
759 # Make sure the vars are correctly initialized 819 # Make sure the vars are correctly initialized
760 mysql_init_vars 820 mysql_init_vars
761 821
762 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 822 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
763 823
764 if built_with_use ${CATEGORY}/${PN} minimal ; then 824 if built_with_use ${CATEGORY}/${PN} minimal ; then
765 die "Minimal builds do NOT include the MySQL server" 825 die "Minimal builds do NOT include the MySQL server"
766 fi 826 fi
767 827
768 local pwd1="a" 828 local pwd1="a"
769 local pwd2="b" 829 local pwd2="b"
770 local maxtry=5 830 local maxtry=5
771 831
772 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 832 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
773 ewarn "You have already a MySQL database in place." 833 ewarn "You have already a MySQL database in place."
774 ewarn "(${ROOT}/${DATADIR}/*)" 834 ewarn "(${ROOT}/${MY_DATADIR}/*)"
775 ewarn "Please rename or delete it if you wish to replace it." 835 ewarn "Please rename or delete it if you wish to replace it."
776 die "MySQL database already exists!" 836 die "MySQL database already exists!"
777 fi 837 fi
778 838
779 einfo "Creating the mysql database and setting proper" 839 einfo "Creating the mysql database and setting proper"
798 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 858 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
799 || touch "${TMPDIR}/fill_help_tables.sql" 859 || touch "${TMPDIR}/fill_help_tables.sql"
800 help_tables="${TMPDIR}/fill_help_tables.sql" 860 help_tables="${TMPDIR}/fill_help_tables.sql"
801 861
802 pushd "${TMPDIR}" &>/dev/null 862 pushd "${TMPDIR}" &>/dev/null
803 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 863 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
864 if [ $? -ne 0 ]; then
865 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
866 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
867 fi
804 popd &>/dev/null 868 popd &>/dev/null
805 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 869 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
806 || die "MySQL databases not installed" 870 || die "MySQL databases not installed"
807 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 871 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
808 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 872 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
809 873
810 if mysql_version_is_at_least "4.1.3" ; then 874 if mysql_version_is_at_least "4.1.3" ; then
811 options="--skip-ndbcluster" 875 options="--skip-ndbcluster"
812 876
813 # Filling timezones, see 877 # Filling timezones, see
824 local mysqld="${ROOT}/usr/sbin/mysqld \ 888 local mysqld="${ROOT}/usr/sbin/mysqld \
825 ${options} \ 889 ${options} \
826 --user=mysql \ 890 --user=mysql \
827 --skip-grant-tables \ 891 --skip-grant-tables \
828 --basedir=${ROOT}/usr \ 892 --basedir=${ROOT}/usr \
829 --datadir=${ROOT}/${DATADIR} \ 893 --datadir=${ROOT}/${MY_DATADIR} \
830 --skip-innodb \ 894 --skip-innodb \
831 --skip-bdb \ 895 --skip-bdb \
832 --skip-networking \ 896 --skip-networking \
833 --max_allowed_packet=8M \ 897 --max_allowed_packet=8M \
834 --net_buffer_length=16K \ 898 --net_buffer_length=16K \

Legend:
Removed from v.1.72  
changed lines
  Added in v.1.98

  ViewVC Help
Powered by ViewVC 1.1.20