/[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.136
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.136 2010/03/09 20:37:34 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="http://www.primebase.org/download/${PBXT_P}.tar.gz 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_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
200&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \
201&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
202&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \
203&& IUSE="${IUSE} xtradb"
194 204
195# 205#
196# HELPER FUNCTIONS: 206# HELPER FUNCTIONS:
197# 207#
198 208
199# @FUNCTION: mysql_disable_test 209# @FUNCTION: mysql_disable_test
200# @DESCRIPTION: 210# @DESCRIPTION:
201# Helper function to disable specific tests. 211# Helper function to disable specific tests.
202mysql_disable_test() { 212mysql_disable_test() {
213 local rawtestname testname testsuite reason mysql_disable_file
203 local testname="${1}" ; shift 214 rawtestname="${1}" ; shift
204 local reason="${@}" 215 reason="${@}"
216 ewarn "test '${rawtestname}' disabled: '${reason}'"
217
218 testsuite="${rawtestname/.*}"
219 testname="${rawtestname/*.}"
205 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 220 mysql_disable_file="${S}/mysql-test/t/disabled.def"
221 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
206 echo ${testname} : ${reason} >> "${mysql_disable_file}" 222 echo ${testname} : ${reason} >> "${mysql_disable_file}"
207 ewarn "test '${testname}' disabled: '${reason}'" 223
224 # ${S}/mysql-tests/t/disabled.def
225 #
226 # ${S}/mysql-tests/suite/federated/disabled.def
227 #
228 # ${S}/mysql-tests/suite/jp/t/disabled.def
229 # ${S}/mysql-tests/suite/ndb/t/disabled.def
230 # ${S}/mysql-tests/suite/rpl/t/disabled.def
231 # ${S}/mysql-tests/suite/parts/t/disabled.def
232 # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
233 # ${S}/mysql-tests/suite/ndb_team/t/disabled.def
234 # ${S}/mysql-tests/suite/binlog/t/disabled.def
235 # ${S}/mysql-tests/suite/innodb/t/disabled.def
236 if [ -n "${testsuite}" ]; then
237 for mysql_disable_file in \
238 ${S}/mysql-test/suite/${testsuite}/disabled.def \
239 ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
240 FAILED ; do
241 [ -f "${mysql_disable_file}" ] && break
242 done
243 if [ "${mysql_disabled_file}" != "FAILED" ]; then
244 echo "${testname} : ${reason}" >> "${mysql_disable_file}"
245 else
246 ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
247 fi
248 fi
208} 249}
209 250
210# @FUNCTION: mysql_init_vars 251# @FUNCTION: mysql_init_vars
211# @DESCRIPTION: 252# @DESCRIPTION:
212# void mysql_init_vars() 253# void mysql_init_vars()
355 myconf="${myconf} $(use_with perl bench)" 396 myconf="${myconf} $(use_with perl bench)"
356 myconf="${myconf} --enable-assembler" 397 myconf="${myconf} --enable-assembler"
357 myconf="${myconf} --with-extra-tools" 398 myconf="${myconf} --with-extra-tools"
358 myconf="${myconf} --with-innodb" 399 myconf="${myconf} --with-innodb"
359 myconf="${myconf} --without-readline" 400 myconf="${myconf} --without-readline"
401 myconf="${myconf} $(use_with ssl openssl)"
360 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 402 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
361 403
362 # --with-vio is not needed anymore, it's on by default and 404 # --with-vio is not needed anymore, it's on by default and
363 # has been removed from configure 405 # has been removed from configure
406 # Apply to 4.x and 5.0.[0-3]
364 if use ssl ; then 407 if use ssl ; then
365 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio" 408 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
366 fi
367
368 if mysql_version_is_at_least "5.1.11" ; then
369 myconf="${myconf} $(use_with ssl)"
370 else
371 myconf="${myconf} $(use_with ssl openssl)"
372 fi 409 fi
373 410
374 if mysql_version_is_at_least "5.0.60" ; then 411 if mysql_version_is_at_least "5.0.60" ; then
375 if use berkdb ; then 412 if use berkdb ; then
376 elog "Berkeley DB support was disabled due to build failures" 413 elog "Berkeley DB support was disabled due to build failures"
433 470
434configure_51() { 471configure_51() {
435 # TODO: !!!! readd --without-readline 472 # TODO: !!!! readd --without-readline
436 # the failure depend upon config/ac-macros/readline.m4 checking into 473 # the failure depend upon config/ac-macros/readline.m4 checking into
437 # readline.h instead of history.h 474 # readline.h instead of history.h
438 myconf="${myconf} $(use_with ssl)" 475 myconf="${myconf} $(use_with ssl ssl /usr)"
439 myconf="${myconf} --enable-assembler" 476 myconf="${myconf} --enable-assembler"
440 myconf="${myconf} --with-geometry" 477 myconf="${myconf} --with-geometry"
441 myconf="${myconf} --with-readline" 478 myconf="${myconf} --with-readline"
442 myconf="${myconf} --with-row-based-replication"
443 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 479 myconf="${myconf} --with-zlib-dir=/usr/"
444 myconf="${myconf} --without-pstack" 480 myconf="${myconf} --without-pstack"
445 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 481 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
482 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
483 myconf="${myconf} $(use_enable community community-features)"
484 if use community; then
485 myconf="${myconf} $(use_enable profiling)"
486 else
487 myconf="${myconf} --disable-profiling"
488 fi
489 fi
446 490
447 # 5.1 introduces a new way to manage storage engines (plugins) 491 # 5.1 introduces a new way to manage storage engines (plugins)
448 # like configuration=none 492 # like configuration=none
449 local plugins="csv,myisam,myisammrg,heap" 493 local plugins="csv,myisam,myisammrg,heap"
450 if use extraengine ; then 494 if use extraengine ; then
451 # like configuration=max-no-ndb, archive and example removed in 5.1.11 495 # like configuration=max-no-ndb, archive and example removed in 5.1.11
496 # not added yet: ibmdb2i
497 # Not supporting as examples: example,daemon_example,ftexample
452 plugins="${plugins},archive,blackhole,example,federated,partition" 498 plugins="${plugins},archive,blackhole,federated,partition"
453 499
454 elog "Before using the Federated storage engine, please be sure to read" 500 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" 501 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
456 fi 502 fi
457 503
458 # Upstream specifically requests that InnoDB always be built. 504 # Upstream specifically requests that InnoDB always be built:
459 plugins="${plugins},innobase" 505 # - innobase, innodb_plugin
506 # Build falcon if available for 6.x series.
507 for i in innobase innodb_plugin falcon ; do
508 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}"
509 done
460 510
461 # like configuration=max-no-ndb 511 # like configuration=max-no-ndb
462 if use cluster ; then 512 if use cluster ; then
463 plugins="${plugins},ndbcluster" 513 plugins="${plugins},ndbcluster"
464 myconf="${myconf} --with-ndb-binlog" 514 myconf="${myconf} --with-ndb-binlog"
465 fi 515 fi
466 516
467 if mysql_version_is_at_least "5.2" ; then
468 plugins="${plugins},falcon"
469 fi
470
471 myconf="${myconf} --with-plugins=${plugins}" 517 myconf="${myconf} --with-plugins=${plugins}"
518}
519
520xtradb_applicable() {
521 mysql_version_is_at_least "5.1.26" \
522 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
523 && use xtradb
524 return $?
525}
526
527pbxt_applicable() {
528 mysql_version_is_at_least "5.1.12" \
529 && [[ -n "${PBXT_VERSION}" ]] \
530 && use pbxt
531 return $?
472} 532}
473 533
474pbxt_src_configure() { 534pbxt_src_configure() {
475 mysql_init_vars 535 mysql_init_vars
476 536
478 538
479 einfo "Reconfiguring dir '${PWD}'" 539 einfo "Reconfiguring dir '${PWD}'"
480 AT_GNUCONF_UPDATE="yes" eautoreconf 540 AT_GNUCONF_UPDATE="yes" eautoreconf
481 541
482 local myconf="" 542 local myconf=""
483 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}" 543 myconf="${myconf} --with-mysql=${S} --libdir=${MY_LIBDIR}"
484 use debug && myconf="${myconf} --with-debug=full" 544 use debug && myconf="${myconf} --with-debug=full"
485 # TODO: is it safe/needed to use econf here ? 545 # TODO: is it safe/needed to use econf here ?
486 ./configure ${myconf} || die "Problem configuring PBXT storage engine" 546 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
487} 547}
488 548
498 # TODO: modify test suite for PBXT 558 # TODO: modify test suite for PBXT
499} 559}
500 560
501pbxt_src_install() { 561pbxt_src_install() {
502 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 562 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
503 make install || die "Failed to install PBXT" 563 emake install DESTDIR="${D}" || die "Failed to install PBXT"
504 popd 564 popd
505} 565}
506 566
507# 567#
508# EBUILD FUNCTIONS 568# EBUILD FUNCTIONS
542 && use minimal ; then 602 && use minimal ; then
543 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 603 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
544 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 604 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
545 fi 605 fi
546 606
607 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
608 if mysql_version_is_at_least "5.0.83" ; then
609 GCC_VER=$(gcc-version)
610 case ${GCC_VER} in
611 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;;
612 esac
613 fi
614
547 # This should come after all of the die statements 615 # This should come after all of the die statements
548 enewgroup mysql 60 || die "problem adding 'mysql' group" 616 enewgroup mysql 60 || die "problem adding 'mysql' group"
549 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 617 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
550 618
551 mysql_check_version_range "4.0 to 5.0.99.99" \ 619 mysql_check_version_range "4.0 to 5.0.99.99" \
552 && use berkdb \ 620 && use berkdb \
553 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 621 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
622
623 if [ "${PN}" != "mysql-cluster" ] && use cluster; then
624 ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
625 ewarn "5.1 series should NOT be put into production. In the near"
626 ewarn "future, it will be disabled from building."
627 ewarn ""
628 ewarn "If you need NDB support, you should instead move to the new"
629 ewarn "mysql-cluster package that represents that upstream NDB"
630 ewarn "development."
631 fi
554} 632}
555 633
556# @FUNCTION: mysql_src_unpack 634# @FUNCTION: mysql_src_unpack
557# @DESCRIPTION: 635# @DESCRIPTION:
558# Unpack the source code and call mysql_src_prepare for EAPI < 2. 636# Unpack the source code and call mysql_src_prepare for EAPI < 2.
587 # Now link in right patches 665 # Now link in right patches
588 mysql_mv_patches 666 mysql_mv_patches
589 # And apply 667 # And apply
590 epatch 668 epatch
591 669
670 # last -fPIC fixup, per bug #305873
671 i="${S}"/storage/innodb_plugin/plug.in
672 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
673
592 # Additional checks, remove bundled zlib 674 # Additional checks, remove bundled zlib
593 rm -f "${S}/zlib/"*.[ch] 675 rm -f "${S}/zlib/"*.[ch]
594 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 676 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
595 rm -f "scripts/mysqlbug" 677 rm -f "scripts/mysqlbug"
596 678
598 find . -name 'Makefile.am' \ 680 find . -name 'Makefile.am' \
599 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 681 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
600 682
601 if mysql_version_is_at_least "4.1" ; then 683 if mysql_version_is_at_least "4.1" ; then
602 # Remove what needs to be recreated, so we're sure it's actually done 684 # Remove what needs to be recreated, so we're sure it's actually done
685 einfo "Cleaning up old buildscript files"
603 find . -name Makefile \ 686 find . -name Makefile \
604 -o -name Makefile.in \ 687 -o -name Makefile.in \
605 -o -name configure \ 688 -o -name configure \
606 -exec rm -f {} \; 689 -exec rm -f {} \;
607 rm -f "ltmain.sh" 690 rm -f "ltmain.sh"
608 rm -f "scripts/mysqlbug" 691 rm -f "scripts/mysqlbug"
609 fi 692 fi
610 693
611 local rebuilddirlist d 694 local rebuilddirlist d
612 695
696 if xtradb_applicable ; then
697 einfo "Replacing InnoDB with Percona XtraDB"
698 pushd "${S}"/storage
699 i="innobase"
700 o="${WORKDIR}/storage-${i}.mysql-upstream"
701 # Have we been here already?
702 [ -d "${o}" ] && rm -f "${i}"
703 # Or maybe we haven't
704 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
705 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}"
706 popd
707 fi
708
613 if mysql_version_is_at_least "5.1.12" ; then 709 if mysql_version_is_at_least "5.1.12" ; then
614 rebuilddirlist="." 710 rebuilddirlist="."
711 # This does not seem to be needed presently. robbat2 2010/02/23
712 #einfo "Updating innobase cmake"
615 # TODO: check this with a cmake expert 713 ## TODO: check this with a cmake expert
616 cmake \ 714 #cmake \
617 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 715 # -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
618 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 716 # -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
619 "storage/innobase" 717 # "storage/innobase"
620 else 718 else
621 rebuilddirlist=". innobase" 719 rebuilddirlist=". innobase"
622 fi 720 fi
623 721
624 for d in ${rebuilddirlist} ; do 722 for d in ${rebuilddirlist} ; do
628 popd &>/dev/null 726 popd &>/dev/null
629 done 727 done
630 728
631 if mysql_check_version_range "4.1 to 5.0.99.99" \ 729 if mysql_check_version_range "4.1 to 5.0.99.99" \
632 && use berkdb ; then 730 && use berkdb ; then
731 einfo "Fixing up berkdb buildsystem"
633 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 732 [[ -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" \ 733 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
635 || die "Could not copy libtool.m4 to bdb/dist/" 734 || die "Could not copy libtool.m4 to bdb/dist/"
636 #These files exist only with libtool-2*, and need to be included. 735 #These files exist only with libtool-2*, and need to be included.
637 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 736 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
707 find . -type f -name Makefile -print0 \ 806 find . -type f -name Makefile -print0 \
708 | xargs -0 -n100 sed -i \ 807 | xargs -0 -n100 sed -i \
709 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 808 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
710 809
711 if [[ $EAPI == 2 ]]; then 810 if [[ $EAPI == 2 ]]; then
712 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure 811 pbxt_applicable && pbxt_src_configure
713 fi 812 fi
714} 813}
715 814
716# @FUNCTION: mysql_src_compile 815# @FUNCTION: mysql_src_compile
717# @DESCRIPTION: 816# @DESCRIPTION:
723 0 | 1) mysql_src_configure ;; 822 0 | 1) mysql_src_configure ;;
724 esac 823 esac
725 824
726 emake || die "emake failed" 825 emake || die "emake failed"
727 826
728 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile 827 pbxt_applicable && pbxt_src_compile
729} 828}
730 829
731# @FUNCTION: mysql_src_install 830# @FUNCTION: mysql_src_install
732# @DESCRIPTION: 831# @DESCRIPTION:
733# Install mysql. 832# Install mysql.
734mysql_src_install() { 833mysql_src_install() {
735 # Make sure the vars are correctly initialized 834 # Make sure the vars are correctly initialized
736 mysql_init_vars 835 mysql_init_vars
737 836
738 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 837 emake install \
838 DESTDIR="${D}" \
839 benchdir_root="${MY_SHAREDSTATEDIR}" \
840 testroot="${MY_SHAREDSTATEDIR}" \
841 || die "emake install failed"
739 842
740 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 843 pbxt_applicable && pbxt_src_install
741 844
742 # Convenience links 845 # Convenience links
743 einfo "Making Convenience links for mysqlcheck multi-call binary" 846 einfo "Making Convenience links for mysqlcheck multi-call binary"
744 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 847 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
745 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 848 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
749 einfo "Removing duplicate /usr/share/mysql files" 852 einfo "Removing duplicate /usr/share/mysql files"
750 rm -Rf "${D}/usr/share/info" 853 rm -Rf "${D}/usr/share/info"
751 for removeme in "mysql-log-rotate" mysql.server* \ 854 for removeme in "mysql-log-rotate" mysql.server* \
752 binary-configure* my-*.cnf mi_test_all* 855 binary-configure* my-*.cnf mi_test_all*
753 do 856 do
754 rm -f "${D}"/usr/share/mysql/${removeme} 857 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
755 done 858 done
756 859
757 # Clean up stuff for a minimal build 860 # Clean up stuff for a minimal build
758 if use minimal ; then 861 if use minimal ; then
759 einfo "Remove all extra content for minimal build" 862 einfo "Remove all extra content for minimal build"
760 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 863 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} 864 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" 865 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 866 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
867 fi
868
869 # Unless they explicitly specific USE=test, then do not install the
870 # testsuite. It DOES have a use to be installed, esp. when you want to do a
871 # validation of your database configuration after tuning it.
872 if use !test ; then
873 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
764 fi 874 fi
765 875
766 # Configuration stuff 876 # Configuration stuff
767 if mysql_version_is_at_least "4.1" ; then 877 if mysql_version_is_at_least "4.1" ; then
768 mysql_mycnf_version="4.1" 878 mysql_mycnf_version="4.1"
799 done 909 done
800 fi 910 fi
801 911
802 # Docs 912 # Docs
803 einfo "Installing docs" 913 einfo "Installing docs"
804 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 914 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
805 doinfo "${S}"/Docs/mysql.info 915 doinfo "${S}"/Docs/mysql.info
806 916
807 # Minimal builds don't have the MySQL server 917 # Minimal builds don't have the MySQL server
808 if ! use minimal ; then 918 if ! use minimal ; then
809 einfo "Including support files and sample configurations" 919 einfo "Including support files and sample configurations"
811 for script in \ 921 for script in \
812 "${S}"/support-files/my-*.cnf \ 922 "${S}"/support-files/my-*.cnf \
813 "${S}"/support-files/magic \ 923 "${S}"/support-files/magic \
814 "${S}"/support-files/ndb-config-2-node.ini 924 "${S}"/support-files/ndb-config-2-node.ini
815 do 925 do
816 dodoc "${script}" 926 [[ -f "$script" ]] && dodoc "${script}"
817 done 927 done
818 928
819 docinto "scripts" 929 docinto "scripts"
820 for script in "${S}"/scripts/mysql* ; do 930 for script in "${S}"/scripts/mysql* ; do
821 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 931 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
822 done 932 done
823 933
824 fi 934 fi
825 935
826 mysql_lib_symlinks "${D}" 936 mysql_lib_symlinks "${D}"
875 elog "\"emerge --config =${CATEGORY}/${PF}\"" 985 elog "\"emerge --config =${CATEGORY}/${PF}\""
876 elog "if this is a new install." 986 elog "if this is a new install."
877 einfo 987 einfo
878 fi 988 fi
879 989
880 if mysql_version_is_at_least "5.1.12" && use pbxt ; then 990 if pbxt_applicable ; then
881 # TODO: explain it better 991 # TODO: explain it better
882 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 992 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
883 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 993 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
884 elog "if, after that, you cannot start the MySQL server," 994 elog "if, after that, you cannot start the MySQL server,"
885 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 995 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"

Legend:
Removed from v.1.120  
changed lines
  Added in v.1.136

  ViewVC Help
Powered by ViewVC 1.1.20