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

Diff of /eclass/mysql.eclass

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

Revision 1.141 Revision 1.148
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/Attic/mysql.eclass,v 1.141 2010/03/24 03:45:56 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.148 2010/08/09 19:29:49 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>
152# Work out the default SERVER_URI correctly 152# Work out the default SERVER_URI correctly
153if [ -z "${SERVER_URI}" ]; then 153if [ -z "${SERVER_URI}" ]; then
154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" 154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
155 if [ "${PN}" == "mariadb" ]; then 155 if [ "${PN}" == "mariadb" ]; then
156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})" 156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
157 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
158 SERVER_URI="
159 http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
160 http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
157 SERVER_URI="http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/mariadb-${MARIA_FULL_PV}.tar.gz" 161 http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
162 "
158 # The community build is on the mirrors 163 # The community build is on the mirrors
159 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 164 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
160 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz" 165 if [[ "${PN}" == "mysql-cluster" ]] ; then
166 URI_DIR="MySQL-Cluster"
167 URI_FILE="mysql-cluster-gpl"
168 else
169 URI_DIR="MySQL"
170 URI_FILE="mysql"
171 fi
172 URI_A="${URI_FILE}-${MY_PV}.tar.gz"
173 MIRROR_PV=$(get_version_component_range 1-2 ${PV})
174 # Recently upstream switched to an archive site, and not on mirrors
175 SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
176 mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
161 # The (old) enterprise source is on the primary site only 177 # The (old) enterprise source is on the primary site only
162 elif [ "${PN}" == "mysql" ]; then 178 elif [ "${PN}" == "mysql" ]; then
163 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz" 179 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
164 fi 180 fi
165fi 181fi
177DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 193DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
178HOMEPAGE="http://www.mysql.com/" 194HOMEPAGE="http://www.mysql.com/"
179if [[ "${PN}" == "mariadb" ]]; then 195if [[ "${PN}" == "mariadb" ]]; then
180 HOMEPAGE="http://askmonty.org/" 196 HOMEPAGE="http://askmonty.org/"
181 DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged." 197 DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
198fi
199if [[ "${PN}" == "mysql-community" ]]; then
200 DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
182fi 201fi
183LICENSE="GPL-2" 202LICENSE="GPL-2"
184SLOT="0" 203SLOT="0"
185IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test" 204IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
186 205
229 && mysql_version_is_at_least "5.1.26" \ 248 && mysql_version_is_at_least "5.1.26" \
230 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] 249 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
231 return $? 250 return $?
232} 251}
233 252
253
234pbxt_patch_available \ 254pbxt_patch_available \
235&& PBXT_P="pbxt-${PBXT_VERSION}" \ 255&& PBXT_P="pbxt-${PBXT_VERSION}" \
236&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \ 256&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
237&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \ 257&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
238 258
259# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
260# vs. built outside the dir
239pbxt_available \ 261pbxt_available \
240&& IUSE="${IUSE} pbxt" 262&& IUSE="${IUSE} pbxt" \
263&& mysql_version_is_at_least "5.1.40" \
264&& PBXT_NEWSTYLE=1
241 265
242xtradb_patch_available \ 266xtradb_patch_available \
243&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \ 267&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
244&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \ 268&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
245&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \ 269&& XTRADB_SRC_B1="http://www.percona.com/" \
270&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
271&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
246&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \ 272&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
273&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
247&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \ 274&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
248&& IUSE="${IUSE} xtradb" 275&& IUSE="${IUSE} xtradb"
249 276
250# 277#
251# HELPER FUNCTIONS: 278# HELPER FUNCTIONS:
252# 279#
349 MY_DATADIR="${new_MY_DATADIR}" 376 MY_DATADIR="${new_MY_DATADIR}"
350 fi 377 fi
351 fi 378 fi
352 fi 379 fi
353 380
381 if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
354 MY_SOURCEDIR=${SERVER_URI##*/} 382 MY_SOURCEDIR=${SERVER_URI##*/}
355 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 383 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
384 fi
356 385
357 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 386 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
358 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 387 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
359 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR 388 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
360} 389}
521 myconf="${myconf} --enable-assembler" 550 myconf="${myconf} --enable-assembler"
522 myconf="${myconf} --with-geometry" 551 myconf="${myconf} --with-geometry"
523 myconf="${myconf} --with-readline" 552 myconf="${myconf} --with-readline"
524 myconf="${myconf} --with-zlib-dir=/usr/" 553 myconf="${myconf} --with-zlib-dir=/usr/"
525 myconf="${myconf} --without-pstack" 554 myconf="${myconf} --without-pstack"
555 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
556
526 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 557 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
527 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 558 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
528 myconf="${myconf} $(use_enable community community-features)" 559 myconf="${myconf} $(use_enable community community-features)"
529 if use community; then 560 if use community; then
530 myconf="${myconf} $(use_enable profiling)" 561 myconf="${myconf} $(use_enable profiling)"
531 else 562 else
532 myconf="${myconf} --disable-profiling" 563 myconf="${myconf} --disable-profiling"
533 fi 564 fi
534 fi 565 fi
535 566
567 # Scan for all available plugins
568 local plugins_avail="$(
569 LANG=C \
570 find "${S}" \
571 \( \
572 -name 'plug.in' \
573 -o -iname 'configure.in' \
574 -o -iname 'configure.ac' \
575 \) \
576 -print0 \
577 | xargs -0 sed -r -n \
578 -e '/^MYSQL_STORAGE_ENGINE/{
579 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
580 s~^([^ ]+).*~\1~gp;
581 }' \
582 | tr -s '\n' ' '
583 )"
584
536 # 5.1 introduces a new way to manage storage engines (plugins) 585 # 5.1 introduces a new way to manage storage engines (plugins)
537 # like configuration=none 586 # like configuration=none
538 # This base set are required, and will always be statically built. 587 # This base set are required, and will always be statically built.
539 local plugins="csv,myisam,myisammrg,heap" 588 local plugins_sta="csv myisam myisammrg heap"
589 local plugins_dyn=""
590 local plugins_dis="example ibmdb2i"
591
592 # These aren't actually required by the base set, but are really useful:
593 plugins_sta="${plugins_sta} archive blackhole"
594
595 # default in 5.5.4
596 if mysql_version_is_at_least "5.5.4" ; then
597 plugins_sta="${plugins_sta} partition"
598 fi
599 # Now the extras
540 if use extraengine ; then 600 if use extraengine ; then
541 # like configuration=max-no-ndb, archive and example removed in 5.1.11 601 # like configuration=max-no-ndb, archive and example removed in 5.1.11
542 # not added yet: ibmdb2i 602 # not added yet: ibmdb2i
543 # Not supporting as examples: example,daemon_example,ftexample 603 # Not supporting as examples: example,daemon_example,ftexample
544 plugins="${plugins},archive,blackhole,federated,partition" 604 plugins_sta="${plugins_sta} partition"
605 plugins_dyn="${plugins_sta} federated"
545 606
546 if [[ "${PN}" != "mariadb" ]] ; then 607 if [[ "${PN}" != "mariadb" ]] ; then
547 elog "Before using the Federated storage engine, please be sure to read" 608 elog "Before using the Federated storage engine, please be sure to read"
548 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 609 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
549 else 610 else
550 elog "MariaDB includes the FederatedX engine. Be sure to read" 611 elog "MariaDB includes the FederatedX engine. Be sure to read"
551 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine" 612 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
552 fi 613 fi
614 else
615 plugins_dis="${plugins_dis} partition federated"
553 fi 616 fi
554 617
555 # Upstream specifically requests that InnoDB always be built: 618 # Upstream specifically requests that InnoDB always be built:
556 # - innobase, innodb_plugin 619 # - innobase, innodb_plugin
557 # Build falcon if available for 6.x series. 620 # Build falcon if available for 6.x series.
558 for i in innobase innodb_plugin falcon ; do 621 for i in innobase falcon ; do
559 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}" 622 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
623 done
624 for i in innodb_plugin ; do
625 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
560 done 626 done
561 627
562 # like configuration=max-no-ndb 628 # like configuration=max-no-ndb
563 if use cluster ; then 629 if use cluster ; then
564 plugins="${plugins},ndbcluster" 630 plugins_sta="${plugins_sta} ndbcluster partition"
631 plugins_dis="${plugins_dis//partition}"
565 myconf="${myconf} --with-ndb-binlog" 632 myconf="${myconf} --with-ndb-binlog"
633 else
634 plugins_dis="${plugins_dis} ndbcluster"
566 fi 635 fi
567 636
568 if [[ "${PN}" == "mariadb" ]] ; then 637 if [[ "${PN}" == "mariadb" ]] ; then
569 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not 638 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
570 # caught above. 639 # caught above.
571 plugins="${plugins},maria,innobase" 640 plugins_sta="${plugins_sta} maria innobase"
572 if use pbxt ; then
573 plugins="${plugins},pbxt"
574 else
575 myconf="${myconf} --without-plugin-pbxt"
576 fi
577 myconf="${myconf} $(use_with libevent)" 641 myconf="${myconf} $(use_with libevent)"
578 # This is not optional, without it several upstream testcases fail. 642 # This is not optional, without it several upstream testcases fail.
579 # Also strongly recommended by upstream. 643 # Also strongly recommended by upstream.
580 myconf="${myconf} --with-maria-tmp-tables" 644 myconf="${myconf} --with-maria-tmp-tables"
581 fi 645 fi
646
647 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
648 use pbxt \
649 && plugins_dyn="${plugins_dyn} pbxt" \
650 || plugins_dis="${plugins_dis} pbxt"
651 fi
582 652
653 use static && \
654 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
655 plugins_dyn=""
656
657 einfo "Available plugins: ${plugins_avail}"
658 einfo "Dynamic plugins: ${plugins_dyn}"
659 einfo "Static plugins: ${plugins_sta}"
660 einfo "Disabled plugins: ${plugins_dis}"
661
662 # These are the static plugins
583 myconf="${myconf} --with-plugins=${plugins}" 663 myconf="${myconf} --with-plugins=${plugins_sta// /,}"
664 # And the disabled ones
665 for i in ${plugins_dis} ; do
666 myconf="${myconf} --without-plugin-${i}"
667 done
584} 668}
585 669
586pbxt_src_configure() { 670pbxt_src_configure() {
587 mysql_init_vars 671 mysql_init_vars
588 672
596 use debug && myconf="${myconf} --with-debug=full" 680 use debug && myconf="${myconf} --with-debug=full"
597 econf ${myconf} || die "Problem configuring PBXT storage engine" 681 econf ${myconf} || die "Problem configuring PBXT storage engine"
598} 682}
599 683
600pbxt_src_compile() { 684pbxt_src_compile() {
685
601 # Be backwards compatible for now 686 # Be backwards compatible for now
602 if [[ $EAPI != 2 ]]; then 687 if [[ $EAPI != 2 ]]; then
603 pbxt_src_configure 688 pbxt_src_configure
604 fi 689 fi
605 # TODO: is it safe/needed to use emake here ? 690 # TODO: is it safe/needed to use emake here ?
634 fi 719 fi
635 fi 720 fi
636 721
637 # Check for USE flag problems in pkg_setup 722 # Check for USE flag problems in pkg_setup
638 if use static && use ssl ; then 723 if use static && use ssl ; then
639 eerror "MySQL does not support being built statically with SSL support enabled!"
640 die "MySQL does not support being built statically with SSL support enabled!" 724 M="MySQL does not support being built statically with SSL support enabled!"
725 eerror "${M}"
726 die "${M}"
641 fi 727 fi
642 728
643 if ! mysql_version_is_at_least "5.0" \ 729 if ! mysql_version_is_at_least "5.0" \
644 && use raid \ 730 && use raid \
645 && use static ; then 731 && use static ; then
647 eerror "with RAID support enabled." 733 eerror "with RAID support enabled."
648 die "USE flags 'raid' and 'static' conflict!" 734 die "USE flags 'raid' and 'static' conflict!"
649 fi 735 fi
650 736
651 if mysql_version_is_at_least "4.1.3" \ 737 if mysql_version_is_at_least "4.1.3" \
652 && ( use cluster || use extraengine ) \ 738 && ( use cluster || use extraengine || use embedded ) \
653 && use minimal ; then 739 && use minimal ; then
654 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
655 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 740 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
741 eerror "${M}"
742 die "${M}"
656 fi 743 fi
657 744
658 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
659 if mysql_version_is_at_least "5.0.83" ; then 745 if mysql_version_is_at_least "5.1" \
746 && xtradb_patch_available \
747 && use xtradb \
748 && use embedded ; then
749 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
750 eerror "${M}"
751 die "${M}"
752 fi
753
754 # Bug #290570, 284946, 307251
755 # Upstream changes made us need a fairly new GCC4.
756 # But only for 5.0.8[3-6]!
757 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
660 GCC_VER=$(gcc-version) 758 GCC_VER=$(gcc-version)
661 case ${GCC_VER} in 759 case ${GCC_VER} in
662 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;; 760 2*|3*|4.0|4.1|4.2)
761 eerror "Some releases of MySQL required a very new GCC, and then"
762 eerror "later release relaxed that requirement again. Either pick a"
763 eerror "MySQL >=5.0.87, or use a newer GCC."
764 die "Active GCC too old!" ;;
663 esac 765 esac
664 fi 766 fi
665 767
666 # This should come after all of the die statements 768 # This should come after all of the die statements
667 enewgroup mysql 60 || die "problem adding 'mysql' group" 769 enewgroup mysql 60 || die "problem adding 'mysql' group"
743 fi 845 fi
744 846
745 local rebuilddirlist d 847 local rebuilddirlist d
746 848
747 if xtradb_patch_available && use xtradb ; then 849 if xtradb_patch_available && use xtradb ; then
748 einfo "Replacing InnoDB with Percona XtraDB" 850 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
749 pushd "${S}"/storage 851 pushd "${S}"/storage >/dev/null
750 i="innobase" 852 i="innobase"
751 o="${WORKDIR}/storage-${i}.mysql-upstream" 853 o="${WORKDIR}/storage-${i}.mysql-upstream"
752 # Have we been here already? 854 # Have we been here already?
753 [ -d "${o}" ] && rm -f "${i}" 855 [ -d "${o}" ] && rm -f "${i}"
754 # Or maybe we haven't 856 # Or maybe we haven't
755 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 857 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
756 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}" 858 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
757 popd 859 popd >/dev/null
860 fi
861
862 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
863 einfo "Adding storage engine: PBXT"
864 pushd "${S}"/storage >/dev/null
865 i='pbxt'
866 [ -d "${i}" ] && rm -rf "${i}"
867 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
868 popd >/dev/null
758 fi 869 fi
759 870
760 if mysql_version_is_at_least "5.1.12" ; then 871 if mysql_version_is_at_least "5.1.12" ; then
761 rebuilddirlist="." 872 rebuilddirlist="."
762 # This does not seem to be needed presently. robbat2 2010/02/23 873 # This does not seem to be needed presently. robbat2 2010/02/23
856 # TODO: Move this before autoreconf !!! 967 # TODO: Move this before autoreconf !!!
857 find . -type f -name Makefile -print0 \ 968 find . -type f -name Makefile -print0 \
858 | xargs -0 -n100 sed -i \ 969 | xargs -0 -n100 sed -i \
859 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 970 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
860 971
861 if [[ $EAPI == 2 ]]; then 972 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
862 pbxt_patch_available && use pbxt && pbxt_src_configure 973 pbxt_patch_available && use pbxt && pbxt_src_configure
863 fi 974 fi
864} 975}
865 976
866# @FUNCTION: mysql_src_compile 977# @FUNCTION: mysql_src_compile
873 0 | 1) mysql_src_configure ;; 984 0 | 1) mysql_src_configure ;;
874 esac 985 esac
875 986
876 emake || die "emake failed" 987 emake || die "emake failed"
877 988
989 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
878 pbxt_patch_available && use pbxt && pbxt_src_compile 990 pbxt_patch_available && use pbxt && pbxt_src_compile
991 fi
879} 992}
880 993
881# @FUNCTION: mysql_src_install 994# @FUNCTION: mysql_src_install
882# @DESCRIPTION: 995# @DESCRIPTION:
883# Install mysql. 996# Install mysql.
889 DESTDIR="${D}" \ 1002 DESTDIR="${D}" \
890 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1003 benchdir_root="${MY_SHAREDSTATEDIR}" \
891 testroot="${MY_SHAREDSTATEDIR}" \ 1004 testroot="${MY_SHAREDSTATEDIR}" \
892 || die "emake install failed" 1005 || die "emake install failed"
893 1006
1007 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
894 pbxt_patch_available && use pbxt && pbxt_src_install 1008 pbxt_patch_available && use pbxt && pbxt_src_install
1009 fi
895 1010
896 # Convenience links 1011 # Convenience links
897 einfo "Making Convenience links for mysqlcheck multi-call binary" 1012 einfo "Making Convenience links for mysqlcheck multi-call binary"
898 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1013 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
899 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1014 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
1195 --user=mysql \ 1310 --user=mysql \
1196 --basedir=${ROOT}/usr \ 1311 --basedir=${ROOT}/usr \
1197 --datadir=${ROOT}/${MY_DATADIR} \ 1312 --datadir=${ROOT}/${MY_DATADIR} \
1198 --max_allowed_packet=8M \ 1313 --max_allowed_packet=8M \
1199 --net_buffer_length=16K \ 1314 --net_buffer_length=16K \
1315 --default-storage-engine=MyISAM \
1200 --socket=${socket} \ 1316 --socket=${socket} \
1201 --pid-file=${pidfile}" 1317 --pid-file=${pidfile}"
1202 #einfo "About to start mysqld: ${mysqld}" 1318 #einfo "About to start mysqld: ${mysqld}"
1203 ebegin "Starting mysqld" 1319 ebegin "Starting mysqld"
1204 ${mysqld} & 1320 ${mysqld} &

Legend:
Removed from v.1.141  
changed lines
  Added in v.1.148

  ViewVC Help
Powered by ViewVC 1.1.20