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

Diff of /eclass/mysql.eclass

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

Revision 1.120 Revision 1.133
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 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.120 2009/12/09 18:46:53 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.133 2010/02/21 00:18:16 robbat2 Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org> 8# Maintainers: MySQL Team <mysql-bugs@gentoo.org>
… …
16# phase hooks. 16# phase hooks.
17 17
18WANT_AUTOCONF="latest" 18WANT_AUTOCONF="latest"
19WANT_AUTOMAKE="latest" 19WANT_AUTOMAKE="latest"
20 20
21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator 21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs
22
23# Shorten the path because the socket path length must be shorter than 107 chars
24# and we will run a mysql server during test phase
25S="${WORKDIR}/mysql"
26
27[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
28if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
29 EGIT_PROJECT=mysql-extras
30 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
31 inherit git
32fi
22 33
23case "${EAPI:-0}" in 34case "${EAPI:-0}" in
24 2) 35 2)
25 EXPORT_FUNCTIONS pkg_setup \ 36 EXPORT_FUNCTIONS pkg_setup \
26 src_unpack src_prepare \ 37 src_unpack src_prepare \
… …
40 ;; 51 ;;
41 *) 52 *)
42 die "Unsupported EAPI: ${EAPI}" ;; 53 die "Unsupported EAPI: ${EAPI}" ;;
43esac 54esac
44 55
45# Shorten the path because the socket path length must be shorter than 107 chars
46# and we will run a mysql server during test phase
47S="${WORKDIR}/mysql"
48
49[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
50if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
51 EGIT_PROJECT=mysql-extras
52 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
53 inherit git
54fi
55
56# @ECLASS-VARIABLE: MYSQL_VERSION_ID 56# @ECLASS-VARIABLE: MYSQL_VERSION_ID
57# @DESCRIPTION: 57# @DESCRIPTION:
58# MYSQL_VERSION_ID will be: 58# MYSQL_VERSION_ID will be:
59# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 59# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
60# This is an important part, because many of the choices the MySQL ebuild will do 60# This is an important part, because many of the choices the MySQL ebuild will do
… …
83 MYSQL_COMMUNITY_FEATURES=1 83 MYSQL_COMMUNITY_FEATURES=1
84elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then 84elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
85 MYSQL_COMMUNITY_FEATURES=1 85 MYSQL_COMMUNITY_FEATURES=1
86elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then 86elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
87 MYSQL_COMMUNITY_FEATURES=1 87 MYSQL_COMMUNITY_FEATURES=1
88elif [ "${PV#5.4}" != "${PV}" ]; then 88elif [ "${PV#5.4}" != "${PV}" ] ; then
89 MYSQL_COMMUNITY_FEATURES=1
90elif [ "${PV#5.5}" != "${PV}" ] ; then
91 MYSQL_COMMUNITY_FEATURES=1
92elif [ "${PV#6.0}" != "${PV}" ] ; then
89 MYSQL_COMMUNITY_FEATURES=1 93 MYSQL_COMMUNITY_FEATURES=1
90else 94else
91 MYSQL_COMMUNITY_FEATURES=0 95 MYSQL_COMMUNITY_FEATURES=0
92fi 96fi
93 97
… …
134# For other stuff to bring us in 138# For other stuff to bring us in
135PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})" 139PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
136 140
137# Work out the default SERVER_URI correctly 141# Work out the default SERVER_URI correctly
138if [ -z "${SERVER_URI}" ]; then 142if [ -z "${SERVER_URI}" ]; then
143 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
139 # The community build is on the mirrors 144 # The community build is on the mirrors
140 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 145 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
141 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" 146 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz"
142 # The (old) enterprise source is on the primary site only 147 # The (old) enterprise source is on the primary site only
143 elif [ "${PN}" == "mysql" ]; then 148 elif [ "${PN}" == "mysql" ]; then
144 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 149 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
145 fi 150 fi
146fi 151fi
147 152
148# Define correct SRC_URIs 153# Define correct SRC_URIs
149SRC_URI="${SERVER_URI}" 154SRC_URI="${SERVER_URI}"
150 155
151[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI} 156# Gentoo patches to MySQL
157[[ ${MY_EXTRAS_VER} != live ]] \
158&& SRC_URI="${SRC_URI}
152 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 159 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
153 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" 160 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
154PBXT_SRC_URI="mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz" 161 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
155mysql_version_is_at_least "5.1.12" \
156&& [[ -n "${PBXT_VERSION}" ]] \
157&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URIPBXT_SRC_URI} )"
158
159# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
160XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/percona-xtradb-${XTRADB_VER}.tar.gz"
161mysql_version_is_at_least "5.1.26" \
162&& [[ -n ${XTRADB_VER} && -n ${PERCONA_VER} ]] \
163&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )"
164 162
165DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 163DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
166HOMEPAGE="http://www.mysql.com/" 164HOMEPAGE="http://www.mysql.com/"
167LICENSE="GPL-2" 165LICENSE="GPL-2"
168SLOT="0" 166SLOT="0"
169IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static" 167IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
170 168
171mysql_version_is_at_least "4.1" \ 169mysql_version_is_at_least "4.1" \
172&& IUSE="${IUSE} latin1" 170&& IUSE="${IUSE} latin1"
173 171
174mysql_version_is_at_least "4.1.3" \ 172mysql_version_is_at_least "4.1.3" \
… …
181&& IUSE="${IUSE} max-idx-128" 179&& IUSE="${IUSE} max-idx-128"
182 180
183mysql_version_is_at_least "5.1" \ 181mysql_version_is_at_least "5.1" \
184|| IUSE="${IUSE} berkdb" 182|| IUSE="${IUSE} berkdb"
185 183
186mysql_version_is_at_least "5.1.12" \
187&& IUSE="${IUSE} pbxt"
188
189mysql_version_is_at_least "5.1.26" \
190&& IUSE="${IUSE} xtradb"
191
192[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ 184[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
193&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" 185&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
186
187# PBXT engine
188mysql_version_is_at_least "5.1.12" \
189&& [[ -n "${PBXT_VERSION}" ]] \
190&& PBXT_P="pbxt-${PBXT_VERSION}" \
191&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
192&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
193&& IUSE="${IUSE} pbxt"
194
195# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
196mysql_version_is_at_least "5.1.26" \
197&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
198&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
199&& XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
200&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )" \
201&& IUSE="${IUSE} xtradb"
194 202
195# 203#
196# HELPER FUNCTIONS: 204# HELPER FUNCTIONS:
197# 205#
198 206
199# @FUNCTION: mysql_disable_test 207# @FUNCTION: mysql_disable_test
200# @DESCRIPTION: 208# @DESCRIPTION:
201# Helper function to disable specific tests. 209# Helper function to disable specific tests.
202mysql_disable_test() { 210mysql_disable_test() {
211 local rawtestname testname testsuite reason mysql_disable_file
203 local testname="${1}" ; shift 212 rawtestname="${1}" ; shift
204 local reason="${@}" 213 reason="${@}"
214 ewarn "test '${rawtestname}' disabled: '${reason}'"
215
216 testsuite="${rawtestname/.*}"
217 testname="${rawtestname/*.}"
205 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 218 mysql_disable_file="${S}/mysql-test/t/disabled.def"
219 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
206 echo ${testname} : ${reason} >> "${mysql_disable_file}" 220 echo ${testname} : ${reason} >> "${mysql_disable_file}"
207 ewarn "test '${testname}' disabled: '${reason}'" 221
222 # ${S}/mysql-tests/t/disabled.def
223 #
224 # ${S}/mysql-tests/suite/federated/disabled.def
225 #
226 # ${S}/mysql-tests/suite/jp/t/disabled.def
227 # ${S}/mysql-tests/suite/ndb/t/disabled.def
228 # ${S}/mysql-tests/suite/rpl/t/disabled.def
229 # ${S}/mysql-tests/suite/parts/t/disabled.def
230 # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
231 # ${S}/mysql-tests/suite/ndb_team/t/disabled.def
232 # ${S}/mysql-tests/suite/binlog/t/disabled.def
233 # ${S}/mysql-tests/suite/innodb/t/disabled.def
234 if [ -n "${testsuite}" ]; then
235 for mysql_disable_file in \
236 ${S}/mysql-test/suite/${testsuite}/disabled.def \
237 ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
238 FAILED ; do
239 [ -f "${mysql_disable_file}" ] && break
240 done
241 if [ "${mysql_disabled_file}" != "FAILED" ]; then
242 echo "${testname} : ${reason}" >> "${mysql_disable_file}"
243 else
244 ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
245 fi
246 fi
208} 247}
209 248
210# @FUNCTION: mysql_init_vars 249# @FUNCTION: mysql_init_vars
211# @DESCRIPTION: 250# @DESCRIPTION:
212# void mysql_init_vars() 251# void mysql_init_vars()
… …
437 # readline.h instead of history.h 476 # readline.h instead of history.h
438 myconf="${myconf} $(use_with ssl)" 477 myconf="${myconf} $(use_with ssl)"
439 myconf="${myconf} --enable-assembler" 478 myconf="${myconf} --enable-assembler"
440 myconf="${myconf} --with-geometry" 479 myconf="${myconf} --with-geometry"
441 myconf="${myconf} --with-readline" 480 myconf="${myconf} --with-readline"
442 myconf="${myconf} --with-row-based-replication"
443 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 481 myconf="${myconf} --with-zlib-dir=/usr/"
444 myconf="${myconf} --without-pstack" 482 myconf="${myconf} --without-pstack"
445 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 483 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
446 484
447 # 5.1 introduces a new way to manage storage engines (plugins) 485 # 5.1 introduces a new way to manage storage engines (plugins)
448 # like configuration=none 486 # like configuration=none
449 local plugins="csv,myisam,myisammrg,heap" 487 local plugins="csv,myisam,myisammrg,heap"
450 if use extraengine ; then 488 if use extraengine ; then
451 # like configuration=max-no-ndb, archive and example removed in 5.1.11 489 # like configuration=max-no-ndb, archive and example removed in 5.1.11
490 # not added yet: ibmdb2i
491 # Not supporting as examples: example,daemon_example,ftexample
452 plugins="${plugins},archive,blackhole,example,federated,partition" 492 plugins="${plugins},archive,blackhole,federated,partition"
453 493
454 elog "Before using the Federated storage engine, please be sure to read" 494 elog "Before using the Federated storage engine, please be sure to read"
455 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 495 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
456 fi 496 fi
457 497
458 # Upstream specifically requests that InnoDB always be built. 498 # Upstream specifically requests that InnoDB always be built:
459 plugins="${plugins},innobase" 499 # - innobase, innodb_plugin
500 # Build falcon if available for 6.x series.
501 for i in innobase innodb_plugin falcon ; do
502 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}"
503 done
460 504
461 # like configuration=max-no-ndb 505 # like configuration=max-no-ndb
462 if use cluster ; then 506 if use cluster ; then
463 plugins="${plugins},ndbcluster" 507 plugins="${plugins},ndbcluster"
464 myconf="${myconf} --with-ndb-binlog" 508 myconf="${myconf} --with-ndb-binlog"
465 fi 509 fi
466 510
467 if mysql_version_is_at_least "5.2" ; then
468 plugins="${plugins},falcon"
469 fi
470
471 myconf="${myconf} --with-plugins=${plugins}" 511 myconf="${myconf} --with-plugins=${plugins}"
512}
513
514xtradb_applicable() {
515 mysql_version_is_at_least "5.1.26" \
516 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
517 && use xtradb
518 return $?
519}
520
521pbxt_applicable() {
522 mysql_version_is_at_least "5.1.12" \
523 && [[ -n "${PBXT_VERSION}" ]] \
524 && use pbxt
525 return $?
472} 526}
473 527
474pbxt_src_configure() { 528pbxt_src_configure() {
475 mysql_init_vars 529 mysql_init_vars
476 530
… …
542 && use minimal ; then 596 && use minimal ; then
543 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 597 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
544 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 598 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
545 fi 599 fi
546 600
601 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
602 if mysql_version_is_at_least "5.0.83" ; then
603 GCC_VER=$(gcc-version)
604 case ${GCC_VER} in
605 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;;
606 esac
607 fi
608
547 # This should come after all of the die statements 609 # This should come after all of the die statements
548 enewgroup mysql 60 || die "problem adding 'mysql' group" 610 enewgroup mysql 60 || die "problem adding 'mysql' group"
549 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 611 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
550 612
551 mysql_check_version_range "4.0 to 5.0.99.99" \ 613 mysql_check_version_range "4.0 to 5.0.99.99" \
552 && use berkdb \ 614 && use berkdb \
553 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 615 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
616
617 if [ "${PN}" != "mysql-cluster" ] && use cluster; then
618 ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
619 ewarn "5.1 series should NOT be put into production. In the near"
620 ewarn "future, it will be disabled from building."
621 ewarn ""
622 ewarn "If you need NDB support, you should instead move to the new"
623 ewarn "mysql-cluster package that represents that upstream NDB"
624 ewarn "development."
625 fi
554} 626}
555 627
556# @FUNCTION: mysql_src_unpack 628# @FUNCTION: mysql_src_unpack
557# @DESCRIPTION: 629# @DESCRIPTION:
558# Unpack the source code and call mysql_src_prepare for EAPI < 2. 630# Unpack the source code and call mysql_src_prepare for EAPI < 2.
… …
587 # Now link in right patches 659 # Now link in right patches
588 mysql_mv_patches 660 mysql_mv_patches
589 # And apply 661 # And apply
590 epatch 662 epatch
591 663
664 # last -fPIC fixup, per bug #305873
665 i="${S}"/storage/innodb_plugin/plug.in
666 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
667
592 # Additional checks, remove bundled zlib 668 # Additional checks, remove bundled zlib
593 rm -f "${S}/zlib/"*.[ch] 669 rm -f "${S}/zlib/"*.[ch]
594 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 670 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
595 rm -f "scripts/mysqlbug" 671 rm -f "scripts/mysqlbug"
596 672
… …
598 find . -name 'Makefile.am' \ 674 find . -name 'Makefile.am' \
599 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 675 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
600 676
601 if mysql_version_is_at_least "4.1" ; then 677 if mysql_version_is_at_least "4.1" ; then
602 # Remove what needs to be recreated, so we're sure it's actually done 678 # Remove what needs to be recreated, so we're sure it's actually done
679 einfo "Cleaning up old buildscript files"
603 find . -name Makefile \ 680 find . -name Makefile \
604 -o -name Makefile.in \ 681 -o -name Makefile.in \
605 -o -name configure \ 682 -o -name configure \
606 -exec rm -f {} \; 683 -exec rm -f {} \;
607 rm -f "ltmain.sh" 684 rm -f "ltmain.sh"
608 rm -f "scripts/mysqlbug" 685 rm -f "scripts/mysqlbug"
609 fi 686 fi
610 687
611 local rebuilddirlist d 688 local rebuilddirlist d
612 689
690 if xtradb_applicable ; then
691 einfo "Replacing InnoDB with Percona XtraDB"
692 pushd "${S}"/storage
693 i="innobase"
694 o="${WORKDIR}/storage-${i}.mysql-upstream"
695 # Have we been here already?
696 [ -h "${i}" ] && rm -f "${i}"
697 # Or maybe we haven't
698 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
699 ln -s "${WORKDIR}/${XTRADB_P}" "${i}"
700 popd
701 fi
702
613 if mysql_version_is_at_least "5.1.12" ; then 703 if mysql_version_is_at_least "5.1.12" ; then
704 einfo "Updating innobase cmake"
614 rebuilddirlist="." 705 rebuilddirlist="."
615 # TODO: check this with a cmake expert 706 # TODO: check this with a cmake expert
616 cmake \ 707 cmake \
617 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 708 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
618 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 709 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
… …
628 popd &>/dev/null 719 popd &>/dev/null
629 done 720 done
630 721
631 if mysql_check_version_range "4.1 to 5.0.99.99" \ 722 if mysql_check_version_range "4.1 to 5.0.99.99" \
632 && use berkdb ; then 723 && use berkdb ; then
724 einfo "Fixing up berkdb buildsystem"
633 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 725 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
634 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 726 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
635 || die "Could not copy libtool.m4 to bdb/dist/" 727 || die "Could not copy libtool.m4 to bdb/dist/"
636 #These files exist only with libtool-2*, and need to be included. 728 #These files exist only with libtool-2*, and need to be included.
637 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 729 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
… …
707 find . -type f -name Makefile -print0 \ 799 find . -type f -name Makefile -print0 \
708 | xargs -0 -n100 sed -i \ 800 | xargs -0 -n100 sed -i \
709 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 801 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
710 802
711 if [[ $EAPI == 2 ]]; then 803 if [[ $EAPI == 2 ]]; then
712 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure 804 pbxt_applicable && pbxt_src_configure
713 fi 805 fi
714} 806}
715 807
716# @FUNCTION: mysql_src_compile 808# @FUNCTION: mysql_src_compile
717# @DESCRIPTION: 809# @DESCRIPTION:
… …
723 0 | 1) mysql_src_configure ;; 815 0 | 1) mysql_src_configure ;;
724 esac 816 esac
725 817
726 emake || die "emake failed" 818 emake || die "emake failed"
727 819
728 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 820 pbxt_applicable && pbxt_src_compile
729} 821}
730 822
731# @FUNCTION: mysql_src_install 823# @FUNCTION: mysql_src_install
732# @DESCRIPTION: 824# @DESCRIPTION:
733# Install mysql. 825# Install mysql.
734mysql_src_install() { 826mysql_src_install() {
735 # Make sure the vars are correctly initialized 827 # Make sure the vars are correctly initialized
736 mysql_init_vars 828 mysql_init_vars
737 829
738 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 830 emake install \
831 DESTDIR="${D}" \
832 benchdir_root="${MY_SHAREDSTATEDIR}" \
833 testroot="${MY_SHAREDSTATEDIR}" \
834 || die "emake install failed"
739 835
740 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 836 pbxt_applicable && pbxt_src_install
741 837
742 # Convenience links 838 # Convenience links
743 einfo "Making Convenience links for mysqlcheck multi-call binary" 839 einfo "Making Convenience links for mysqlcheck multi-call binary"
744 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 840 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
745 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 841 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
… …
749 einfo "Removing duplicate /usr/share/mysql files" 845 einfo "Removing duplicate /usr/share/mysql files"
750 rm -Rf "${D}/usr/share/info" 846 rm -Rf "${D}/usr/share/info"
751 for removeme in "mysql-log-rotate" mysql.server* \ 847 for removeme in "mysql-log-rotate" mysql.server* \
752 binary-configure* my-*.cnf mi_test_all* 848 binary-configure* my-*.cnf mi_test_all*
753 do 849 do
754 rm -f "${D}"/usr/share/mysql/${removeme} 850 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
755 done 851 done
756 852
757 # Clean up stuff for a minimal build 853 # Clean up stuff for a minimal build
758 if use minimal ; then 854 if use minimal ; then
759 einfo "Remove all extra content for minimal build" 855 einfo "Remove all extra content for minimal build"
760 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 856 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
761 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} 857 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}
762 rm -f "${D}/usr/sbin/mysqld" 858 rm -f "${D}/usr/sbin/mysqld"
763 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 859 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
860 fi
861
862 # Unless they explicitly specific USE=test, then do not install the
863 # testsuite. It DOES have a use to be installed, esp. when you want to do a
864 # validation of your database configuration after tuning it.
865 if use !test ; then
866 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
764 fi 867 fi
765 868
766 # Configuration stuff 869 # Configuration stuff
767 if mysql_version_is_at_least "4.1" ; then 870 if mysql_version_is_at_least "4.1" ; then
768 mysql_mycnf_version="4.1" 871 mysql_mycnf_version="4.1"
… …
799 done 902 done
800 fi 903 fi
801 904
802 # Docs 905 # Docs
803 einfo "Installing docs" 906 einfo "Installing docs"
804 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 907 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
805 doinfo "${S}"/Docs/mysql.info 908 doinfo "${S}"/Docs/mysql.info
806 909
807 # Minimal builds don't have the MySQL server 910 # Minimal builds don't have the MySQL server
808 if ! use minimal ; then 911 if ! use minimal ; then
809 einfo "Including support files and sample configurations" 912 einfo "Including support files and sample configurations"
… …
875 elog "\"emerge --config =${CATEGORY}/${PF}\"" 978 elog "\"emerge --config =${CATEGORY}/${PF}\""
876 elog "if this is a new install." 979 elog "if this is a new install."
877 einfo 980 einfo
878 fi 981 fi
879 982
880 if mysql_version_is_at_least "5.1.12" && use pbxt ; then 983 if pbxt_applicable ; then
881 # TODO: explain it better 984 # TODO: explain it better
882 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 985 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
883 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 986 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
884 elog "if, after that, you cannot start the MySQL server," 987 elog "if, after that, you cannot start the MySQL server,"
885 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 988 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
Legend:
Removed from v.1.120  
changed lines
  Added in v.1.133
  ViewVC Help
Powered by ViewVC 1.1.13