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

Diff of /eclass/mysql.eclass

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

Revision 1.84 Revision 1.107
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.84 2008/01/16 04:01:14 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.107 2009/02/28 10:49:50 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 versionator
15 14
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} >=dev-util/cmake-2.4.3"
78
79# BitKeeper dependency, compile-time only
80[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
81
65 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# For other stuff to bring us in
70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 87PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
71 88
72# Work out the default SERVER_URI correctly 89# Work out the default SERVER_URI correctly
73if [ -z "${SERVER_URI}" ]; then 90if [ -z "${SERVER_URI}" ]; then
74 # The community build is on the mirrors 91 # The community build is on the mirrors
75 if [ "${PN}" == "mysql-community" ]; then 92 if [ "${PN}" == "mysql-community" ]; then
79 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 96 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
80 fi 97 fi
81fi 98fi
82 99
83# Define correct SRC_URIs 100# Define correct SRC_URIs
84SRC_URI="${SERVER_URI} 101SRC_URI="${SERVER_URI}"
102
103[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
85 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 104 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
86 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 105 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
87mysql_version_is_at_least "5.1.12" \ 106mysql_version_is_at_least "5.1.12" \
88&& [[ -n "${PBXT_VERSION}" ]] \ 107&& [[ -n "${PBXT_VERSION}" ]] \
89&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 108&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
105 124
106mysql_version_is_at_least "5.0.18" \ 125mysql_version_is_at_least "5.0.18" \
107&& IUSE="${IUSE} max-idx-128" 126&& IUSE="${IUSE} max-idx-128"
108 127
109mysql_version_is_at_least "5.1" \ 128mysql_version_is_at_least "5.1" \
110&& IUSE="${IUSE} innodb"
111
112mysql_version_is_at_least "5.1" \
113|| IUSE="${IUSE} berkdb" 129|| IUSE="${IUSE} berkdb"
114 130
115mysql_version_is_at_least "5.1.12" \ 131mysql_version_is_at_least "5.1.12" \
116&& IUSE="${IUSE} pbxt" 132&& IUSE="${IUSE} pbxt"
117
118RDEPEND="${DEPEND}
119 !minimal? ( dev-db/mysql-init-scripts )
120 selinux? ( sec-policy/selinux-mysql )"
121 133
122EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 134EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
123 pkg_postinst pkg_config pkg_postrm 135 pkg_postinst pkg_config pkg_postrm
124 136
125# 137#
216 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 228 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
217 | sed -ne '/datadir/s|^--datadir=||p' \ 229 | sed -ne '/datadir/s|^--datadir=||p' \
218 | tail -n1` 230 | tail -n1`
219 if [[ -z "${MY_DATADIR}" ]] ; then 231 if [[ -z "${MY_DATADIR}" ]] ; then
220 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 232 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
221 | sed -e 's/.*=\s*//'` 233 | sed -e 's/.*=\s*//' \
234 | tail -n1`
222 fi 235 fi
223 fi 236 fi
224 if [[ -z "${MY_DATADIR}" ]] ; then 237 if [[ -z "${MY_DATADIR}" ]] ; then
225 MY_DATADIR="${MY_LOCALSTATEDIR}" 238 MY_DATADIR="${MY_LOCALSTATEDIR}"
226 einfo "Using default MY_DATADIR" 239 einfo "Using default MY_DATADIR"
227 fi 240 fi
228 elog "MySQL MY_DATADIR is ${MY_DATADIR}" 241 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
229 242
230 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 243 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
231 if [[ -e "${MY_DATADIR}" ]] ; then 244 if [[ -e "${MY_DATADIR}" ]] ; then
232 elog "Previous datadir found, it's YOUR job to change" 245 # If you get this and you're wondering about it, see bug #207636
233 elog "ownership and take care of it" 246 elog "MySQL datadir found in ${MY_DATADIR}"
247 elog "A new one will not be created."
234 PREVIOUS_DATADIR="yes" 248 PREVIOUS_DATADIR="yes"
235 else 249 else
236 PREVIOUS_DATADIR="no" 250 PREVIOUS_DATADIR="no"
237 fi 251 fi
238 export PREVIOUS_DATADIR 252 export PREVIOUS_DATADIR
299 mysql_version_is_at_least "4.1.3" \ 313 mysql_version_is_at_least "4.1.3" \
300 && use cluster \ 314 && use cluster \
301 && myconf="${myconf} --without-ndb-debug" 315 && myconf="${myconf} --without-ndb-debug"
302 fi 316 fi
303 317
318 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
319 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
320 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
321 ewarn "You MUST file bugs without these variables set."
322 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
323 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
304 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 324 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
305 myconf="${myconf} --with-charset=utf8" 325 myconf="${myconf} --with-charset=utf8"
306 myconf="${myconf} --with-collation=utf8_general_ci" 326 myconf="${myconf} --with-collation=utf8_general_ci"
307 else 327 else
308 myconf="${myconf} --with-charset=latin1" 328 myconf="${myconf} --with-charset=latin1"
309 myconf="${myconf} --with-collation=latin1_swedish_ci" 329 myconf="${myconf} --with-collation=latin1_swedish_ci"
310 fi 330 fi
311 331
312 if use embedded ; then 332 if use embedded ; then
313 myconf="${myconf} --with-embedded-privilege-control" 333 myconf="${myconf} --with-embedded-privilege-control"
314 myconf="${myconf} --with-embedded-server" 334 myconf="${myconf} --with-embedded-server"
337 myconf="${myconf} $(use_with ssl)" 357 myconf="${myconf} $(use_with ssl)"
338 else 358 else
339 myconf="${myconf} $(use_with ssl openssl)" 359 myconf="${myconf} $(use_with ssl openssl)"
340 fi 360 fi
341 361
362 if mysql_version_is_at_least "5.0.60" ; then
342 if use berkdb ; then 363 if use berkdb ; then
364 elog "Berkeley DB support was disabled due to build failures"
365 elog "on multiple arches, go to a version earlier than 5.0.60"
366 elog "if you want it again. Gentoo bug #224067."
367 fi
368 myconf="${myconf} --without-berkeley-db"
369 elif use berkdb ; then
343 # The following fix is due to a bug with bdb on SPARC's. See: 370 # The following fix is due to a bug with bdb on SPARC's. See:
344 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 371 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
345 # It comes down to non-64-bit safety problems. 372 # It comes down to non-64-bit safety problems.
346 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 373 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
347 elog "Berkeley DB support was disabled due to compatibility issues on this arch" 374 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
374 if mysql_version_is_at_least "5.0.3" ; then 401 if mysql_version_is_at_least "5.0.3" ; then
375 elog "Before using the Federated storage engine, please be sure to read" 402 elog "Before using the Federated storage engine, please be sure to read"
376 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 403 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
377 myconf="${myconf} --with-federated-storage-engine" 404 myconf="${myconf} --with-federated-storage-engine"
378 fi 405 fi
406 fi
407
408 if [ "${PN}" == "mysql-community" ]; then
409 myconf="${myconf} --enable-community-features"
379 fi 410 fi
380 411
381 mysql_version_is_at_least "5.0.18" \ 412 mysql_version_is_at_least "5.0.18" \
382 && use max-idx-128 \ 413 && use max-idx-128 \
383 && myconf="${myconf} --with-max-indexes=128" 414 && myconf="${myconf} --with-max-indexes=128"
405 436
406 elog "Before using the Federated storage engine, please be sure to read" 437 elog "Before using the Federated storage engine, please be sure to read"
407 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 438 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
408 fi 439 fi
409 440
410 if use innodb ; then 441 # Upstream specifically requests that InnoDB always be built.
411 plugins="${plugins},innobase" 442 plugins="${plugins},innobase"
412 fi
413 443
414 # like configuration=max-no-ndb 444 # like configuration=max-no-ndb
415 if use cluster ; then 445 if use cluster ; then
416 plugins="${plugins},ndbcluster" 446 plugins="${plugins},ndbcluster"
417 myconf="${myconf} --with-ndb-binlog" 447 myconf="${myconf} --with-ndb-binlog"
454# EBUILD FUNCTIONS 484# EBUILD FUNCTIONS
455# 485#
456mysql_pkg_setup() { 486mysql_pkg_setup() {
457 if hasq test ${FEATURES} ; then 487 if hasq test ${FEATURES} ; then
458 if ! use minimal ; then 488 if ! use minimal ; then
459 if ! hasq userpriv ${FEATURES} ; then 489 if [[ $UID -eq 0 ]]; then
460 die "Testing with FEATURES=-userpriv is no longer supported by upstream" 490 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
461 fi 491 fi
462 fi 492 fi
463 fi 493 fi
464 494
465 # Check for USE flag problems in pkg_setup 495 # Check for USE flag problems in pkg_setup
480 && ( use cluster || use extraengine ) \ 510 && ( use cluster || use extraengine ) \
481 && use minimal ; then 511 && use minimal ; then
482 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 512 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
483 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 513 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
484 fi 514 fi
485 515
486 # This should come after all of the die statements 516 # This should come after all of the die statements
487 enewgroup mysql 60 || die "problem adding 'mysql' group" 517 enewgroup mysql 60 || die "problem adding 'mysql' group"
488 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 518 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
489 519
490 mysql_check_version_range "4.0 to 5.0.99.99" \ 520 mysql_check_version_range "4.0 to 5.0.99.99" \
495mysql_src_unpack() { 525mysql_src_unpack() {
496 # Initialize the proper variables first 526 # Initialize the proper variables first
497 mysql_init_vars 527 mysql_init_vars
498 528
499 unpack ${A} 529 unpack ${A}
530 # Grab the patches
531 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
532 # Bitkeeper checkout support
500 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 533 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
501 if mysql_check_version_range "5.1 to 5.1.99" ; then 534 if mysql_check_version_range "5.1 to 5.1.99" ; then
502 bitkeeper_fetch "mysql-5.1-ndb" 535 bitkeeper_fetch "mysql-5.1-ndb"
503 elif mysql_check_version_range "5.2 to 5.2.99" ; then 536 elif mysql_check_version_range "5.2 to 5.2.99" ; then
504 bitkeeper_fetch "mysql-5.2-falcon" 537 bitkeeper_fetch "mysql-5.2-falcon"
514 fi 547 fi
515 548
516 # Apply the patches for this MySQL version 549 # Apply the patches for this MySQL version
517 EPATCH_SUFFIX="patch" 550 EPATCH_SUFFIX="patch"
518 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 551 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
552 # Clean out old items
553 rm -f "${EPATCH_SOURCE}"/*
554 # Now link in right patches
519 mysql_mv_patches 555 mysql_mv_patches
556 # And apply
520 epatch 557 epatch
521 558
522 # Additional checks, remove bundled zlib 559 # Additional checks, remove bundled zlib
523 rm -f "${S}/zlib/"*.[ch] 560 rm -f "${S}/zlib/"*.[ch]
524 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 561 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
541 local rebuilddirlist d 578 local rebuilddirlist d
542 579
543 if mysql_version_is_at_least "5.1.12" ; then 580 if mysql_version_is_at_least "5.1.12" ; then
544 rebuilddirlist="." 581 rebuilddirlist="."
545 # TODO: check this with a cmake expert 582 # TODO: check this with a cmake expert
546 use innodb \
547 && cmake \ 583 cmake \
548 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 584 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
549 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 585 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
550 "storage/innobase" 586 "storage/innobase"
551 else 587 else
552 rebuilddirlist=". innobase" 588 rebuilddirlist=". innobase"
562 if mysql_check_version_range "4.1 to 5.0.99.99" \ 598 if mysql_check_version_range "4.1 to 5.0.99.99" \
563 && use berkdb ; then 599 && use berkdb ; then
564 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 600 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
565 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 601 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
566 || die "Could not copy libtool.m4 to bdb/dist/" 602 || die "Could not copy libtool.m4 to bdb/dist/"
603 #These files exist only with libtool-2*, and need to be included.
604 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
605 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
606 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
607 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
608 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
609 fi
567 pushd "bdb/dist" &>/dev/null 610 pushd "bdb/dist" &>/dev/null
568 sh s_all \ 611 sh s_all \
569 || die "Failed bdb reconfigure" 612 || die "Failed bdb reconfigure"
570 popd &>/dev/null 613 popd &>/dev/null
571 fi 614 fi
592 # Bug #114895, bug #110149 635 # Bug #114895, bug #110149
593 filter-flags "-O" "-O[01]" 636 filter-flags "-O" "-O[01]"
594 637
595 # glib-2.3.2_pre fix, bug #16496 638 # glib-2.3.2_pre fix, bug #16496
596 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 639 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
640
641 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
642 # fail badly during cluster startup.
643 if [[ $(gcc-major-version) -lt 4 ]]; then
644 filter-flags "-fstack-protector-all"
645 fi
597 646
598 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 647 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
599 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 648 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
600 mysql_version_is_at_least "5.0" \ 649 mysql_version_is_at_least "5.0" \
601 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 650 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
631 680
632 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 681 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
633 682
634 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 683 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
635 684
636 insinto "${MY_INCLUDEDIR}"
637 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
638
639 # Convenience links 685 # Convenience links
686 einfo "Making Convenience links for mysqlcheck multi-call binary"
640 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 687 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
641 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 688 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
642 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 689 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
643 690
644 # Various junk (my-*.cnf moved elsewhere) 691 # Various junk (my-*.cnf moved elsewhere)
692 einfo "Removing duplicate /usr/share/mysql files"
645 rm -Rf "${D}/usr/share/info" 693 rm -Rf "${D}/usr/share/info"
646 for removeme in "mysql-log-rotate" mysql.server* \ 694 for removeme in "mysql-log-rotate" mysql.server* \
647 binary-configure* my-*.cnf mi_test_all* 695 binary-configure* my-*.cnf mi_test_all*
648 do 696 do
649 rm -f "${D}"/usr/share/mysql/${removeme} 697 rm -f "${D}"/usr/share/mysql/${removeme}
650 done 698 done
651 699
652 # Clean up stuff for a minimal build 700 # Clean up stuff for a minimal build
653 if use minimal ; then 701 if use minimal ; then
702 einfo "Remove all extra content for minimal build"
654 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 703 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
655 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam} 704 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
656 rm -f "${D}/usr/sbin/mysqld" 705 rm -f "${D}/usr/sbin/mysqld"
657 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 706 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
658 fi 707 fi
661 if mysql_version_is_at_least "4.1" ; then 710 if mysql_version_is_at_least "4.1" ; then
662 mysql_mycnf_version="4.1" 711 mysql_mycnf_version="4.1"
663 else 712 else
664 mysql_mycnf_version="4.0" 713 mysql_mycnf_version="4.0"
665 fi 714 fi
715 einfo "Building default my.cnf"
666 insinto "${MY_SYSCONFDIR}" 716 insinto "${MY_SYSCONFDIR}"
667 doins scripts/mysqlaccess.conf 717 doins scripts/mysqlaccess.conf
668 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 718 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
669 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 719 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
670 > "${TMPDIR}/my.cnf.ok" 720 > "${TMPDIR}/my.cnf.ok"
673 fi 723 fi
674 newins "${TMPDIR}/my.cnf.ok" my.cnf 724 newins "${TMPDIR}/my.cnf.ok" my.cnf
675 725
676 # Minimal builds don't have the MySQL server 726 # Minimal builds don't have the MySQL server
677 if ! use minimal ; then 727 if ! use minimal ; then
728 einfo "Creating initial directories"
678 # Empty directories ... 729 # Empty directories ...
679 diropts "-m0750" 730 diropts "-m0750"
680 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 731 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
681 dodir "${MY_DATADIR}" 732 dodir "${MY_DATADIR}"
682 keepdir "${MY_DATADIR}" 733 keepdir "${MY_DATADIR}"
690 chown -R mysql:mysql "${D}/${folder}" 741 chown -R mysql:mysql "${D}/${folder}"
691 done 742 done
692 fi 743 fi
693 744
694 # Docs 745 # Docs
746 einfo "Installing docs"
695 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 747 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
696 doinfo ${S}/Docs/mysql.info 748 doinfo "${S}"/Docs/mysql.info
697 749
698 # Minimal builds don't have the MySQL server 750 # Minimal builds don't have the MySQL server
699 if ! use minimal ; then 751 if ! use minimal ; then
752 einfo "Including support files and sample configurations"
700 docinto "support-files" 753 docinto "support-files"
701 for script in \ 754 for script in \
702 support-files/my-*.cnf \ 755 "${S}"/support-files/my-*.cnf \
703 support-files/magic \ 756 "${S}"/support-files/magic \
704 support-files/ndb-config-2-node.ini 757 "${S}"/support-files/ndb-config-2-node.ini
705 do 758 do
706 dodoc "${script}" 759 dodoc "${script}"
707 done 760 done
708 761
709 docinto "scripts" 762 docinto "scripts"
710 for script in scripts/mysql* ; do 763 for script in "${S}"/scripts/mysql* ; do
711 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 764 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
712 done 765 done
713 766
714 fi 767 fi
715 768
795 ewarn "(${ROOT}/${MY_DATADIR}/*)" 848 ewarn "(${ROOT}/${MY_DATADIR}/*)"
796 ewarn "Please rename or delete it if you wish to replace it." 849 ewarn "Please rename or delete it if you wish to replace it."
797 die "MySQL database already exists!" 850 die "MySQL database already exists!"
798 fi 851 fi
799 852
853 # Bug #213475 - MySQL _will_ object strenously if your machine is named
854 # localhost. Also causes weird failures.
855 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
856
800 einfo "Creating the mysql database and setting proper" 857 einfo "Creating the mysql database and setting proper"
801 einfo "permissions on it ..." 858 einfo "permissions on it ..."
802 859
803 einfo "Insert a password for the mysql 'root' user" 860 einfo "Insert a password for the mysql 'root' user"
804 ewarn "Avoid [\"'\\_%] characters in the password" 861 ewarn "Avoid [\"'\\_%] characters in the password"
819 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 876 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
820 || touch "${TMPDIR}/fill_help_tables.sql" 877 || touch "${TMPDIR}/fill_help_tables.sql"
821 help_tables="${TMPDIR}/fill_help_tables.sql" 878 help_tables="${TMPDIR}/fill_help_tables.sql"
822 879
823 pushd "${TMPDIR}" &>/dev/null 880 pushd "${TMPDIR}" &>/dev/null
824 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 881 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
882 if [ $? -ne 0 ]; then
883 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
884 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
885 fi
825 popd &>/dev/null 886 popd &>/dev/null
826 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 887 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
827 || die "MySQL databases not installed" 888 || die "MySQL databases not installed"
828 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null 889 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
829 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null 890 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
830 891
831 if mysql_version_is_at_least "4.1.3" ; then 892 if mysql_version_is_at_least "4.1.3" ; then
832 options="--skip-ndbcluster" 893 options="--skip-ndbcluster"
833 894
834 # Filling timezones, see 895 # Filling timezones, see

Legend:
Removed from v.1.84  
changed lines
  Added in v.1.107

  ViewVC Help
Powered by ViewVC 1.1.20