/[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.118
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.118 2009/11/19 20:59:38 hanno 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
13inherit eutils flag-o-matic gnuconfig autotools mysql_fx 13inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
14
15case "${EAPI:-0}" in
16 2)
17 EXPORT_FUNCTIONS pkg_setup \
18 src_unpack src_prepare \
19 src_configure src_compile \
20 src_install \
21 pkg_preinst pkg_postinst \
22 pkg_config pkg_postrm
23 IUSE_DEFAULT_ON='+'
24 ;;
25 *)
26 EXPORT_FUNCTIONS pkg_setup \
27 src_unpack \
28 src_compile \
29 src_install \
30 pkg_preinst pkg_postinst \
31 pkg_config pkg_postrm
32 ;;
33esac
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
70elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
71 MYSQL_COMMUNITY_FEATURES=1
72elif [ "${PV#5.4}" != "${PV}" ]; then
73 MYSQL_COMMUNITY_FEATURES=1
74else
75 MYSQL_COMMUNITY_FEATURES=0
76fi
77
52# Be warned, *DEPEND are version-dependant 78# Be warned, *DEPEND are version-dependant
53# These are used for both runtime and compiletime 79# These are used for both runtime and compiletime
54DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 80DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
55 userland_GNU? ( sys-process/procps ) 81 userland_GNU? ( sys-process/procps )
56 >=sys-apps/sed-4 82 >=sys-apps/sed-4
72mysql_version_is_at_least "5.1" \ 98mysql_version_is_at_least "5.1" \
73|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 99|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
74 100
75# compile-time-only 101# compile-time-only
76mysql_version_is_at_least "5.1.12" \ 102mysql_version_is_at_least "5.1.12" \
77&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 103&& 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 104
83# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 105# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
84PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 106PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
107
108# For other stuff to bring us in
109PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
85 110
86# Work out the default SERVER_URI correctly 111# Work out the default SERVER_URI correctly
87if [ -z "${SERVER_URI}" ]; then 112if [ -z "${SERVER_URI}" ]; then
88 # The community build is on the mirrors 113 # The community build is on the mirrors
89 if [ "${PN}" == "mysql-community" ]; then 114 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
90 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" 115 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
91 # The enterprise source is on the primary site only 116 # The (old) enterprise source is on the primary site only
92 elif [ "${PN}" == "mysql" ]; then 117 elif [ "${PN}" == "mysql" ]; then
93 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 118 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
94 fi 119 fi
95fi 120fi
96 121
106 131
107DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 132DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
108HOMEPAGE="http://www.mysql.com/" 133HOMEPAGE="http://www.mysql.com/"
109LICENSE="GPL-2" 134LICENSE="GPL-2"
110SLOT="0" 135SLOT="0"
111IUSE="big-tables debug embedded minimal perl selinux ssl static" 136IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static"
112 137
113mysql_version_is_at_least "4.1" \ 138mysql_version_is_at_least "4.1" \
114&& IUSE="${IUSE} latin1" 139&& IUSE="${IUSE} latin1"
115 140
116mysql_version_is_at_least "4.1.3" \ 141mysql_version_is_at_least "4.1.3" \
121 146
122mysql_version_is_at_least "5.0.18" \ 147mysql_version_is_at_least "5.0.18" \
123&& IUSE="${IUSE} max-idx-128" 148&& IUSE="${IUSE} max-idx-128"
124 149
125mysql_version_is_at_least "5.1" \ 150mysql_version_is_at_least "5.1" \
126&& IUSE="${IUSE} innodb"
127
128mysql_version_is_at_least "5.1" \
129|| IUSE="${IUSE} berkdb" 151|| IUSE="${IUSE} berkdb"
130 152
131mysql_version_is_at_least "5.1.12" \ 153mysql_version_is_at_least "5.1.12" \
132&& IUSE="${IUSE} pbxt" 154&& IUSE="${IUSE} pbxt"
133 155
134EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 156[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
135 pkg_postinst pkg_config pkg_postrm 157&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
136 158
137# 159#
138# HELPER FUNCTIONS: 160# HELPER FUNCTIONS:
139# 161#
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 162
204mysql_disable_test() { 163mysql_disable_test() {
205 local testname="${1}" ; shift 164 local testname="${1}" ; shift
206 local reason="${@}" 165 local reason="${@}"
207 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 166 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
248 PREVIOUS_DATADIR="yes" 207 PREVIOUS_DATADIR="yes"
249 else 208 else
250 PREVIOUS_DATADIR="no" 209 PREVIOUS_DATADIR="no"
251 fi 210 fi
252 export PREVIOUS_DATADIR 211 export PREVIOUS_DATADIR
212 fi
213 else
214 if [[ ${EBUILD_PHASE} == "config" ]]; then
215 local new_MY_DATADIR
216 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
217 | sed -ne '/datadir/s|^--datadir=||p' \
218 | tail -n1`
219
220 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
221 ewarn "MySQL MY_DATADIR has changed"
222 ewarn "from ${MY_DATADIR}"
223 ewarn "to ${new_MY_DATADIR}"
224 MY_DATADIR="${new_MY_DATADIR}"
225 fi
253 fi 226 fi
254 fi 227 fi
255 228
256 MY_SOURCEDIR=${SERVER_URI##*/} 229 MY_SOURCEDIR=${SERVER_URI##*/}
257 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 230 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
403 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 376 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
404 myconf="${myconf} --with-federated-storage-engine" 377 myconf="${myconf} --with-federated-storage-engine"
405 fi 378 fi
406 fi 379 fi
407 380
408 if [ "${PN}" == "mysql-community" ]; then 381 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
409 myconf="${myconf} --enable-community-features" 382 myconf="${myconf} `use_enable community community-features`"
383 if use community; then
384 myconf="${myconf} `use_enable profiling`"
385 else
386 myconf="${myconf} --disable-profiling"
387 fi
410 fi 388 fi
411 389
412 mysql_version_is_at_least "5.0.18" \ 390 mysql_version_is_at_least "5.0.18" \
413 && use max-idx-128 \ 391 && use max-idx-128 \
414 && myconf="${myconf} --with-max-indexes=128" 392 && myconf="${myconf} --with-max-indexes=128"
436 414
437 elog "Before using the Federated storage engine, please be sure to read" 415 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" 416 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
439 fi 417 fi
440 418
441 if use innodb ; then 419 # Upstream specifically requests that InnoDB always be built.
442 plugins="${plugins},innobase" 420 plugins="${plugins},innobase"
443 fi
444 421
445 # like configuration=max-no-ndb 422 # like configuration=max-no-ndb
446 if use cluster ; then 423 if use cluster ; then
447 plugins="${plugins},ndbcluster" 424 plugins="${plugins},ndbcluster"
448 myconf="${myconf} --with-ndb-binlog" 425 myconf="${myconf} --with-ndb-binlog"
453 fi 430 fi
454 431
455 myconf="${myconf} --with-plugins=${plugins}" 432 myconf="${myconf} --with-plugins=${plugins}"
456} 433}
457 434
458pbxt_src_compile() { 435pbxt_src_configure() {
459 mysql_init_vars 436 mysql_init_vars
460 437
461 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 438 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
462 439
463 einfo "Reconfiguring dir '${PWD}'" 440 einfo "Reconfiguring dir '${PWD}'"
466 local myconf="" 443 local myconf=""
467 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 444 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
468 use debug && myconf="${myconf} --with-debug=full" 445 use debug && myconf="${myconf} --with-debug=full"
469 # TODO: is it safe/needed to use econf here ? 446 # TODO: is it safe/needed to use econf here ?
470 ./configure ${myconf} || die "Problem configuring PBXT storage engine" 447 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
448}
449
450pbxt_src_compile() {
451 # Be backwards compatible for now
452 if [[ $EAPI != 2 ]]; then
453 pbxt_src_configure
454 fi
471 # TODO: is it safe/needed to use emake here ? 455 # TODO: is it safe/needed to use emake here ?
472 make || die "Problem making PBXT storage engine (${myconf})" 456 make || die "Problem making PBXT storage engine (${myconf})"
473 457
474 popd 458 popd
475 # TODO: modify test suite for PBXT 459 # TODO: modify test suite for PBXT
528 mysql_init_vars 512 mysql_init_vars
529 513
530 unpack ${A} 514 unpack ${A}
531 # Grab the patches 515 # Grab the patches
532 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack 516 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
533 # Bitkeeper checkout support 517
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}" 518 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
519
520 # Be backwards compatible for now
521 if [[ $EAPI != 2 ]]; then
522 mysql_src_prepare
523 fi
524}
525
526mysql_src_prepare() {
547 cd "${S}" 527 cd "${S}"
548 fi
549 528
550 # Apply the patches for this MySQL version 529 # Apply the patches for this MySQL version
551 EPATCH_SUFFIX="patch" 530 EPATCH_SUFFIX="patch"
552 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 531 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
553 # Clean out old items 532 # Clean out old items
579 local rebuilddirlist d 558 local rebuilddirlist d
580 559
581 if mysql_version_is_at_least "5.1.12" ; then 560 if mysql_version_is_at_least "5.1.12" ; then
582 rebuilddirlist="." 561 rebuilddirlist="."
583 # TODO: check this with a cmake expert 562 # TODO: check this with a cmake expert
584 use innodb \
585 && cmake \ 563 cmake \
586 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 564 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
587 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 565 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
588 "storage/innobase" 566 "storage/innobase"
589 else 567 else
590 rebuilddirlist=". innobase" 568 rebuilddirlist=". innobase"
614 || die "Failed bdb reconfigure" 592 || die "Failed bdb reconfigure"
615 popd &>/dev/null 593 popd &>/dev/null
616 fi 594 fi
617} 595}
618 596
619mysql_src_compile() { 597mysql_src_configure() {
620 # Make sure the vars are correctly initialized 598 # Make sure the vars are correctly initialized
621 mysql_init_vars 599 mysql_init_vars
622 600
623 # $myconf is modified by the configure_* functions 601 # $myconf is modified by the configure_* functions
624 local myconf="" 602 local myconf=""
649 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 627 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
650 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 628 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
651 mysql_version_is_at_least "5.0" \ 629 mysql_version_is_at_least "5.0" \
652 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 630 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
653 export CXXFLAGS 631 export CXXFLAGS
632
633 # bug #283926, with GCC4.4, this is required to get correct behavior.
634 append-flags -fno-strict-aliasing
654 635
655 econf \ 636 econf \
656 --libexecdir="/usr/sbin" \ 637 --libexecdir="/usr/sbin" \
657 --sysconfdir="${MY_SYSCONFDIR}" \ 638 --sysconfdir="${MY_SYSCONFDIR}" \
658 --localstatedir="${MY_LOCALSTATEDIR}" \ 639 --localstatedir="${MY_LOCALSTATEDIR}" \
669 # TODO: Move this before autoreconf !!! 650 # TODO: Move this before autoreconf !!!
670 find . -type f -name Makefile -print0 \ 651 find . -type f -name Makefile -print0 \
671 | xargs -0 -n100 sed -i \ 652 | xargs -0 -n100 sed -i \
672 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 653 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
673 654
655 if [[ $EAPI == 2 ]]; then
656 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure
657 fi
658}
659
660mysql_src_compile() {
661 # Be backwards compatible for now
662 if [[ $EAPI != 2 ]]; then
663 mysql_src_configure
664 fi
665
674 emake || die "emake failed" 666 emake || die "emake failed"
675 667
676 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 668 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
677} 669}
678 670
682 674
683 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 675 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
684 676
685 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 677 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
686 678
687 insinto "${MY_INCLUDEDIR}"
688 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
689
690 # Convenience links 679 # Convenience links
680 einfo "Making Convenience links for mysqlcheck multi-call binary"
691 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 681 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
692 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 682 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
693 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 683 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
694 684
695 # Various junk (my-*.cnf moved elsewhere) 685 # Various junk (my-*.cnf moved elsewhere)
686 einfo "Removing duplicate /usr/share/mysql files"
696 rm -Rf "${D}/usr/share/info" 687 rm -Rf "${D}/usr/share/info"
697 for removeme in "mysql-log-rotate" mysql.server* \ 688 for removeme in "mysql-log-rotate" mysql.server* \
698 binary-configure* my-*.cnf mi_test_all* 689 binary-configure* my-*.cnf mi_test_all*
699 do 690 do
700 rm -f "${D}"/usr/share/mysql/${removeme} 691 rm -f "${D}"/usr/share/mysql/${removeme}
701 done 692 done
702 693
703 # Clean up stuff for a minimal build 694 # Clean up stuff for a minimal build
704 if use minimal ; then 695 if use minimal ; then
696 einfo "Remove all extra content for minimal build"
705 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 697 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} 698 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" 699 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 700 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
709 fi 701 fi
712 if mysql_version_is_at_least "4.1" ; then 704 if mysql_version_is_at_least "4.1" ; then
713 mysql_mycnf_version="4.1" 705 mysql_mycnf_version="4.1"
714 else 706 else
715 mysql_mycnf_version="4.0" 707 mysql_mycnf_version="4.0"
716 fi 708 fi
709 einfo "Building default my.cnf"
717 insinto "${MY_SYSCONFDIR}" 710 insinto "${MY_SYSCONFDIR}"
718 doins scripts/mysqlaccess.conf 711 doins scripts/mysqlaccess.conf
719 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 712 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
720 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 713 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
721 > "${TMPDIR}/my.cnf.ok" 714 > "${TMPDIR}/my.cnf.ok"
724 fi 717 fi
725 newins "${TMPDIR}/my.cnf.ok" my.cnf 718 newins "${TMPDIR}/my.cnf.ok" my.cnf
726 719
727 # Minimal builds don't have the MySQL server 720 # Minimal builds don't have the MySQL server
728 if ! use minimal ; then 721 if ! use minimal ; then
722 einfo "Creating initial directories"
729 # Empty directories ... 723 # Empty directories ...
730 diropts "-m0750" 724 diropts "-m0750"
731 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 725 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
732 dodir "${MY_DATADIR}" 726 dodir "${MY_DATADIR}"
733 keepdir "${MY_DATADIR}" 727 keepdir "${MY_DATADIR}"
741 chown -R mysql:mysql "${D}/${folder}" 735 chown -R mysql:mysql "${D}/${folder}"
742 done 736 done
743 fi 737 fi
744 738
745 # Docs 739 # Docs
740 einfo "Installing docs"
746 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 741 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
747 doinfo "${S}"/Docs/mysql.info 742 doinfo "${S}"/Docs/mysql.info
748 743
749 # Minimal builds don't have the MySQL server 744 # Minimal builds don't have the MySQL server
750 if ! use minimal ; then 745 if ! use minimal ; then
746 einfo "Including support files and sample configurations"
751 docinto "support-files" 747 docinto "support-files"
752 for script in \ 748 for script in \
753 "${S}"/support-files/my-*.cnf \ 749 "${S}"/support-files/my-*.cnf \
754 "${S}"/support-files/magic \ 750 "${S}"/support-files/magic \
755 "${S}"/support-files/ndb-config-2-node.ini 751 "${S}"/support-files/ndb-config-2-node.ini
826 && use berkdb \ 822 && use berkdb \
827 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 823 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
828} 824}
829 825
830mysql_pkg_config() { 826mysql_pkg_config() {
827 local old_MY_DATADIR="${MY_DATADIR}"
828
831 # Make sure the vars are correctly initialized 829 # Make sure the vars are correctly initialized
832 mysql_init_vars 830 mysql_init_vars
833 831
834 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 832 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
835 833
836 if built_with_use ${CATEGORY}/${PN} minimal ; then 834 if built_with_use ${CATEGORY}/${PN} minimal ; then
837 die "Minimal builds do NOT include the MySQL server" 835 die "Minimal builds do NOT include the MySQL server"
836 fi
837
838 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
839 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
840 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
841
842 if [[ -d "${old_MY_DATADIR_s}" ]]; then
843 if [[ -d "${MY_DATADIR_s}" ]]; then
844 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
845 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
846 else
847 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
848 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
849 || die "Moving MY_DATADIR failed"
850 fi
851 else
852 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
853 if [[ -d "${MY_DATADIR_s}" ]]; then
854 ewarn "Attempting to use ${MY_DATADIR_s}"
855 else
856 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
857 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
858 fi
859 fi
838 fi 860 fi
839 861
840 local pwd1="a" 862 local pwd1="a"
841 local pwd2="b" 863 local pwd2="b"
842 local maxtry=5 864 local maxtry=5

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

  ViewVC Help
Powered by ViewVC 1.1.20