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

Diff of /eclass/mysql.eclass

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

Revision 1.103 Revision 1.113
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/Attic/mysql.eclass,v 1.103 2009/01/12 23:08:17 maekke Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.113 2009/07/06 19:05:07 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: 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>
9 9
10WANT_AUTOCONF="latest" 10WANT_AUTOCONF="latest"
11WANT_AUTOMAKE="latest" 11WANT_AUTOMAKE="latest"
12 12
13case "${EAPI:-0}" in
14 2)
15 EXPORT_FUNCTIONS pkg_setup \
16 src_unpack src_prepare \
17 src_configure src_compile \
18 src_install \
19 pkg_preinst pkg_postinst \
20 pkg_config pkg_postrm
21 IUSE_DEFAULT_ON='+'
22 ;;
23 *)
24 EXPORT_FUNCTIONS pkg_setup \
25 src_unpack \
26 src_compile \
27 src_install \
28 pkg_preinst pkg_postinst \
29 pkg_config pkg_postrm
30 ;;
31esac
32
13inherit eutils flag-o-matic gnuconfig autotools mysql_fx 33inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
14 34
15# Shorten the path because the socket path length must be shorter than 107 chars 35# Shorten the path because the socket path length must be shorter than 107 chars
16# and we will run a mysql server during test phase 36# and we will run a mysql server during test phase
17S="${WORKDIR}/mysql" 37S="${WORKDIR}/mysql"
18 38
19[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" 39[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then 40if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
21 EGIT_PROJECT=mysql-extras 41 EGIT_PROJECT=mysql-extras
22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" 42 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
23 inherit git 43 inherit git
24fi
25
26if [[ ${PR#r} -lt 60 ]] ; then
27 IS_BITKEEPER=0
28elif [[ ${PR#r} -lt 90 ]] ; then
29 IS_BITKEEPER=60
30else
31 IS_BITKEEPER=90
32fi 44fi
33 45
34# MYSQL_VERSION_ID will be: 46# MYSQL_VERSION_ID will be:
35# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 47# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
36# This is an important part, because many of the choices the MySQL ebuild will do 48# This is an important part, because many of the choices the MySQL ebuild will do
47 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 59 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
48done 60done
49# strip leading "0" (otherwise it's considered an octal number by BASH) 61# strip leading "0" (otherwise it's considered an octal number by BASH)
50MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 62MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
51 63
64# Community features are available in mysql-community
65# AND in the re-merged mysql-5.0.82 and newer
66if [ "${PN}" == "mysql-community" ]; then
67 MYSQL_COMMUNITY_FEATURES=1
68elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
69 MYSQL_COMMUNITY_FEATURES=1
70else
71 MYSQL_COMMUNITY_FEATURES=0
72fi
73
52# Be warned, *DEPEND are version-dependant 74# Be warned, *DEPEND are version-dependant
53# These are used for both runtime and compiletime 75# These are used for both runtime and compiletime
54DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 76DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
55 userland_GNU? ( sys-process/procps ) 77 userland_GNU? ( sys-process/procps )
56 >=sys-apps/sed-4 78 >=sys-apps/sed-4
72mysql_version_is_at_least "5.1" \ 94mysql_version_is_at_least "5.1" \
73|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 95|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
74 96
75# compile-time-only 97# compile-time-only
76mysql_version_is_at_least "5.1.12" \ 98mysql_version_is_at_least "5.1.12" \
77&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 99&& 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
82 100
83# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 101# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
84PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 102PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
103
104# For other stuff to bring us in
105PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
85 106
86# Work out the default SERVER_URI correctly 107# Work out the default SERVER_URI correctly
87if [ -z "${SERVER_URI}" ]; then 108if [ -z "${SERVER_URI}" ]; then
88 # The community build is on the mirrors 109 # The community build is on the mirrors
89 if [ "${PN}" == "mysql-community" ]; then 110 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
90 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" 111 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
91 # The enterprise source is on the primary site only 112 # The (old) enterprise source is on the primary site only
92 elif [ "${PN}" == "mysql" ]; then 113 elif [ "${PN}" == "mysql" ]; then
93 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 114 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
94 fi 115 fi
95fi 116fi
96 117
106 127
107DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 128DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
108HOMEPAGE="http://www.mysql.com/" 129HOMEPAGE="http://www.mysql.com/"
109LICENSE="GPL-2" 130LICENSE="GPL-2"
110SLOT="0" 131SLOT="0"
111IUSE="big-tables debug embedded minimal perl selinux ssl static" 132IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static"
112 133
113mysql_version_is_at_least "4.1" \ 134mysql_version_is_at_least "4.1" \
114&& IUSE="${IUSE} latin1" 135&& IUSE="${IUSE} latin1"
115 136
116mysql_version_is_at_least "4.1.3" \ 137mysql_version_is_at_least "4.1.3" \
121 142
122mysql_version_is_at_least "5.0.18" \ 143mysql_version_is_at_least "5.0.18" \
123&& IUSE="${IUSE} max-idx-128" 144&& IUSE="${IUSE} max-idx-128"
124 145
125mysql_version_is_at_least "5.1" \ 146mysql_version_is_at_least "5.1" \
126&& IUSE="${IUSE} innodb"
127
128mysql_version_is_at_least "5.1" \
129|| IUSE="${IUSE} berkdb" 147|| IUSE="${IUSE} berkdb"
130 148
131mysql_version_is_at_least "5.1.12" \ 149mysql_version_is_at_least "5.1.12" \
132&& IUSE="${IUSE} pbxt" 150&& IUSE="${IUSE} pbxt"
133 151
134EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 152[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
135 pkg_postinst pkg_config pkg_postrm 153&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
136 154
137# 155#
138# HELPER FUNCTIONS: 156# HELPER FUNCTIONS:
139# 157#
140
141bitkeeper_fetch() {
142 local reposuf
143 if [[ -z "${1}" ]] ; then
144 local tpv
145 tpv=( ${PV//[-._]/ } )
146 reposuf="mysql-${tpv[0]}.${tpv[1]}"
147 else
148 reposuf="${1}"
149 fi
150 einfo "Using '${reposuf}' repository."
151 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
152 ## -- ebk_store_dir: bitkeeper sources store directory
153 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
154 ## -- ebk_fetch_cmd: bitkeeper fetch command
155 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
156 # hint: does not work
157 local ebk_fetch_cmd="sfioball"
158 ## -- ebk_update_cmd: bitkeeper update command
159 local ebk_update_cmd="update"
160
161 # addread "/etc/bitkeeper"
162 addwrite "${ebk_store_dir}"
163
164 if [[ ! -d "${ebk_store_dir}" ]] ; then
165 debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
166 mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}"
167 fi
168
169 pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}"
170
171 local wc_path=${reposuf}
172
173 if [[ ! -d "${wc_path}" ]] ; then
174 local options="-r+"
175
176 # first checkout
177 einfo "bitkeeper checkout start -->"
178 einfo " repository: ${repo_uri}"
179
180 ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
181 || die "BK: couldn't fetch from ${repo_uri}"
182 else
183 if [[ ! -d "${wc_path}/BK" ]] ; then
184 popd
185 die "Looks like ${wc_path} is not a bitkeeper path"
186 fi
187
188 # update working copy
189 einfo "bitkeeper update start -->"
190 einfo " repository: ${repo_uri}"
191
192 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
193 || die "BK: couldn't update from ${repo_uri} to ${wc_path}"
194 fi
195
196 einfo " working copy: ${wc_path}"
197 cd "${wc_path}"
198 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}"
199
200 echo
201 popd
202}
203 158
204mysql_disable_test() { 159mysql_disable_test() {
205 local testname="${1}" ; shift 160 local testname="${1}" ; shift
206 local reason="${@}" 161 local reason="${@}"
207 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 162 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
248 PREVIOUS_DATADIR="yes" 203 PREVIOUS_DATADIR="yes"
249 else 204 else
250 PREVIOUS_DATADIR="no" 205 PREVIOUS_DATADIR="no"
251 fi 206 fi
252 export PREVIOUS_DATADIR 207 export PREVIOUS_DATADIR
208 fi
209 else
210 if [[ ${EBUILD_PHASE} == "config" ]]; then
211 local new_MY_DATADIR
212 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
213 | sed -ne '/datadir/s|^--datadir=||p' \
214 | tail -n1`
215
216 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
217 ewarn "MySQL MY_DATADIR has changed"
218 ewarn "from ${MY_DATADIR}"
219 ewarn "to ${new_MY_DATADIR}"
220 MY_DATADIR="${new_MY_DATADIR}"
221 fi
253 fi 222 fi
254 fi 223 fi
255 224
256 MY_SOURCEDIR=${SERVER_URI##*/} 225 MY_SOURCEDIR=${SERVER_URI##*/}
257 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 226 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
403 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 372 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
404 myconf="${myconf} --with-federated-storage-engine" 373 myconf="${myconf} --with-federated-storage-engine"
405 fi 374 fi
406 fi 375 fi
407 376
408 if [ "${PN}" == "mysql-community" ]; then 377 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
409 myconf="${myconf} --enable-community-features" 378 myconf="${myconf} `use_enable community community-features`"
379 if use community; then
380 myconf="${myconf} `use_enable profiling`"
381 else
382 myconf="${myconf} --disable-profiling"
383 fi
410 fi 384 fi
411 385
412 mysql_version_is_at_least "5.0.18" \ 386 mysql_version_is_at_least "5.0.18" \
413 && use max-idx-128 \ 387 && use max-idx-128 \
414 && myconf="${myconf} --with-max-indexes=128" 388 && myconf="${myconf} --with-max-indexes=128"
436 410
437 elog "Before using the Federated storage engine, please be sure to read" 411 elog "Before using the Federated storage engine, please be sure to read"
438 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 412 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
439 fi 413 fi
440 414
441 if use innodb ; then 415 # Upstream specifically requests that InnoDB always be built.
442 plugins="${plugins},innobase" 416 plugins="${plugins},innobase"
443 fi
444 417
445 # like configuration=max-no-ndb 418 # like configuration=max-no-ndb
446 if use cluster ; then 419 if use cluster ; then
447 plugins="${plugins},ndbcluster" 420 plugins="${plugins},ndbcluster"
448 myconf="${myconf} --with-ndb-binlog" 421 myconf="${myconf} --with-ndb-binlog"
453 fi 426 fi
454 427
455 myconf="${myconf} --with-plugins=${plugins}" 428 myconf="${myconf} --with-plugins=${plugins}"
456} 429}
457 430
458pbxt_src_compile() { 431pbxt_src_configure() {
459 mysql_init_vars 432 mysql_init_vars
460 433
461 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 434 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
462 435
463 einfo "Reconfiguring dir '${PWD}'" 436 einfo "Reconfiguring dir '${PWD}'"
466 local myconf="" 439 local myconf=""
467 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 440 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
468 use debug && myconf="${myconf} --with-debug=full" 441 use debug && myconf="${myconf} --with-debug=full"
469 # TODO: is it safe/needed to use econf here ? 442 # TODO: is it safe/needed to use econf here ?
470 ./configure ${myconf} || die "Problem configuring PBXT storage engine" 443 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
444}
445
446pbxt_src_compile() {
447 # Be backwards compatible for now
448 if [[ $EAPI != 2 ]]; then
449 pbxt_src_configure
450 fi
471 # TODO: is it safe/needed to use emake here ? 451 # TODO: is it safe/needed to use emake here ?
472 make || die "Problem making PBXT storage engine (${myconf})" 452 make || die "Problem making PBXT storage engine (${myconf})"
473 453
474 popd 454 popd
475 # TODO: modify test suite for PBXT 455 # TODO: modify test suite for PBXT
528 mysql_init_vars 508 mysql_init_vars
529 509
530 unpack ${A} 510 unpack ${A}
531 # Grab the patches 511 # Grab the patches
532 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack 512 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
533 # Bitkeeper checkout support 513
534 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
535 if mysql_check_version_range "5.1 to 5.1.99" ; then
536 bitkeeper_fetch "mysql-5.1-ndb"
537 elif mysql_check_version_range "5.2 to 5.2.99" ; then
538 bitkeeper_fetch "mysql-5.2-falcon"
539 else
540 bitkeeper_fetch
541 fi
542 cd "${S}"
543 einfo "Running upstream autorun over BK sources ..."
544 BUILD/autorun.sh
545 else
546 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 514 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
515
516 # Be backwards compatible for now
517 if [[ $EAPI != 2 ]]; then
518 mysql_src_prepare
519 fi
520}
521
522mysql_src_prepare() {
547 cd "${S}" 523 cd "${S}"
548 fi
549 524
550 # Apply the patches for this MySQL version 525 # Apply the patches for this MySQL version
551 EPATCH_SUFFIX="patch" 526 EPATCH_SUFFIX="patch"
552 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 527 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
553 # Clean out old items 528 # Clean out old items
579 local rebuilddirlist d 554 local rebuilddirlist d
580 555
581 if mysql_version_is_at_least "5.1.12" ; then 556 if mysql_version_is_at_least "5.1.12" ; then
582 rebuilddirlist="." 557 rebuilddirlist="."
583 # TODO: check this with a cmake expert 558 # TODO: check this with a cmake expert
584 use innodb \
585 && cmake \ 559 cmake \
586 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 560 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
587 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 561 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
588 "storage/innobase" 562 "storage/innobase"
589 else 563 else
590 rebuilddirlist=". innobase" 564 rebuilddirlist=". innobase"
614 || die "Failed bdb reconfigure" 588 || die "Failed bdb reconfigure"
615 popd &>/dev/null 589 popd &>/dev/null
616 fi 590 fi
617} 591}
618 592
619mysql_src_compile() { 593mysql_src_configure() {
620 # Make sure the vars are correctly initialized 594 # Make sure the vars are correctly initialized
621 mysql_init_vars 595 mysql_init_vars
622 596
623 # $myconf is modified by the configure_* functions 597 # $myconf is modified by the configure_* functions
624 local myconf="" 598 local myconf=""
669 # TODO: Move this before autoreconf !!! 643 # TODO: Move this before autoreconf !!!
670 find . -type f -name Makefile -print0 \ 644 find . -type f -name Makefile -print0 \
671 | xargs -0 -n100 sed -i \ 645 | xargs -0 -n100 sed -i \
672 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 646 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
673 647
648 if [[ $EAPI == 2 ]]; then
649 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure
650 fi
651}
652
653mysql_src_compile() {
654 # Be backwards compatible for now
655 if [[ $EAPI != 2 ]]; then
656 mysql_src_configure
657 fi
658
674 emake || die "emake failed" 659 emake || die "emake failed"
675 660
676 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 661 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
677} 662}
678 663
682 667
683 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 668 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
684 669
685 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 670 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
686 671
687 insinto "${MY_INCLUDEDIR}"
688 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
689
690 # Convenience links 672 # Convenience links
673 einfo "Making Convenience links for mysqlcheck multi-call binary"
691 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 674 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
692 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 675 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
693 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 676 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
694 677
695 # Various junk (my-*.cnf moved elsewhere) 678 # Various junk (my-*.cnf moved elsewhere)
679 einfo "Removing duplicate /usr/share/mysql files"
696 rm -Rf "${D}/usr/share/info" 680 rm -Rf "${D}/usr/share/info"
697 for removeme in "mysql-log-rotate" mysql.server* \ 681 for removeme in "mysql-log-rotate" mysql.server* \
698 binary-configure* my-*.cnf mi_test_all* 682 binary-configure* my-*.cnf mi_test_all*
699 do 683 do
700 rm -f "${D}"/usr/share/mysql/${removeme} 684 rm -f "${D}"/usr/share/mysql/${removeme}
701 done 685 done
702 686
703 # Clean up stuff for a minimal build 687 # Clean up stuff for a minimal build
704 if use minimal ; then 688 if use minimal ; then
689 einfo "Remove all extra content for minimal build"
705 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 690 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
706 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} 691 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}
707 rm -f "${D}/usr/sbin/mysqld" 692 rm -f "${D}/usr/sbin/mysqld"
708 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 693 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
709 fi 694 fi
712 if mysql_version_is_at_least "4.1" ; then 697 if mysql_version_is_at_least "4.1" ; then
713 mysql_mycnf_version="4.1" 698 mysql_mycnf_version="4.1"
714 else 699 else
715 mysql_mycnf_version="4.0" 700 mysql_mycnf_version="4.0"
716 fi 701 fi
702 einfo "Building default my.cnf"
717 insinto "${MY_SYSCONFDIR}" 703 insinto "${MY_SYSCONFDIR}"
718 doins scripts/mysqlaccess.conf 704 doins scripts/mysqlaccess.conf
719 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 705 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
720 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 706 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
721 > "${TMPDIR}/my.cnf.ok" 707 > "${TMPDIR}/my.cnf.ok"
724 fi 710 fi
725 newins "${TMPDIR}/my.cnf.ok" my.cnf 711 newins "${TMPDIR}/my.cnf.ok" my.cnf
726 712
727 # Minimal builds don't have the MySQL server 713 # Minimal builds don't have the MySQL server
728 if ! use minimal ; then 714 if ! use minimal ; then
715 einfo "Creating initial directories"
729 # Empty directories ... 716 # Empty directories ...
730 diropts "-m0750" 717 diropts "-m0750"
731 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 718 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
732 dodir "${MY_DATADIR}" 719 dodir "${MY_DATADIR}"
733 keepdir "${MY_DATADIR}" 720 keepdir "${MY_DATADIR}"
741 chown -R mysql:mysql "${D}/${folder}" 728 chown -R mysql:mysql "${D}/${folder}"
742 done 729 done
743 fi 730 fi
744 731
745 # Docs 732 # Docs
733 einfo "Installing docs"
746 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 734 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
747 doinfo "${S}"/Docs/mysql.info 735 doinfo "${S}"/Docs/mysql.info
748 736
749 # Minimal builds don't have the MySQL server 737 # Minimal builds don't have the MySQL server
750 if ! use minimal ; then 738 if ! use minimal ; then
739 einfo "Including support files and sample configurations"
751 docinto "support-files" 740 docinto "support-files"
752 for script in \ 741 for script in \
753 "${S}"/support-files/my-*.cnf \ 742 "${S}"/support-files/my-*.cnf \
754 "${S}"/support-files/magic \ 743 "${S}"/support-files/magic \
755 "${S}"/support-files/ndb-config-2-node.ini 744 "${S}"/support-files/ndb-config-2-node.ini
826 && use berkdb \ 815 && use berkdb \
827 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 816 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
828} 817}
829 818
830mysql_pkg_config() { 819mysql_pkg_config() {
820 local old_MY_DATADIR="${MY_DATADIR}"
821
831 # Make sure the vars are correctly initialized 822 # Make sure the vars are correctly initialized
832 mysql_init_vars 823 mysql_init_vars
833 824
834 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 825 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
835 826
836 if built_with_use ${CATEGORY}/${PN} minimal ; then 827 if built_with_use ${CATEGORY}/${PN} minimal ; then
837 die "Minimal builds do NOT include the MySQL server" 828 die "Minimal builds do NOT include the MySQL server"
829 fi
830
831 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
832 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
833 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
834
835 if [[ -d "${old_MY_DATADIR_s}" ]]; then
836 if [[ -d "${MY_DATADIR_s}" ]]; then
837 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
838 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
839 else
840 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
841 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
842 || die "Moving MY_DATADIR failed"
843 fi
844 else
845 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
846 if [[ -d "${MY_DATADIR_s}" ]]; then
847 ewarn "Attempting to use ${MY_DATADIR_s}"
848 else
849 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
850 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
851 fi
852 fi
838 fi 853 fi
839 854
840 local pwd1="a" 855 local pwd1="a"
841 local pwd2="b" 856 local pwd2="b"
842 local maxtry=5 857 local maxtry=5

Legend:
Removed from v.1.103  
changed lines
  Added in v.1.113

  ViewVC Help
Powered by ViewVC 1.1.20