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

Diff of /eclass/mysql.eclass

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

Revision 1.94 Revision 1.111
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/mysql.eclass,v 1.94 2008/05/29 05:33:49 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.111 2009/07/06 18:21:18 robbat2 Exp $
4 4
5# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 5# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
6# Maintainer: MySQL Team <mysql-bugs@gentoo.org> 6# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
7# - Luca Longinotti <chtekk@gentoo.org> 7# - Luca Longinotti <chtekk@gentoo.org>
8# - Robin H. Johnson <robbat2@gentoo.org> 8# - Robin H. Johnson <robbat2@gentoo.org>
9 9
10WANT_AUTOCONF="latest" 10WANT_AUTOCONF="latest"
11WANT_AUTOMAKE="latest" 11WANT_AUTOMAKE="latest"
12 12
13inherit eutils flag-o-matic gnuconfig autotools mysql_fx 13inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
14 14
15# Shorten the path because the socket path length must be shorter than 107 chars 15# 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 16# and we will run a mysql server during test phase
17S="${WORKDIR}/mysql" 17S="${WORKDIR}/mysql"
18 18
19[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" 19[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then 20if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
21 EGIT_PROJECT=mysql-extras 21 EGIT_PROJECT=mysql-extras
22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" 22 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
23 inherit git 23 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 24fi
33 25
34# MYSQL_VERSION_ID will be: 26# MYSQL_VERSION_ID will be:
35# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 27# 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 28# 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}" 39 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
48done 40done
49# strip leading "0" (otherwise it's considered an octal number by BASH) 41# strip leading "0" (otherwise it's considered an octal number by BASH)
50MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 42MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
51 43
44# Community features are available in mysql-community
45# AND in the re-merged mysql-5.0.82 and newer
46if [ "${PN}" == "mysql-community" ]; then
47 MYSQL_COMMUNITY_FEATURES=1
48elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
49 MYSQL_COMMUNITY_FEATURES=1
50else
51 MYSQL_COMMUNITY_FEATURES=0
52fi
53
52# Be warned, *DEPEND are version-dependant 54# Be warned, *DEPEND are version-dependant
53# These are used for both runtime and compiletime 55# These are used for both runtime and compiletime
54DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 56DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
55 userland_GNU? ( sys-process/procps ) 57 userland_GNU? ( sys-process/procps )
56 >=sys-apps/sed-4 58 >=sys-apps/sed-4
… …
72mysql_version_is_at_least "5.1" \ 74mysql_version_is_at_least "5.1" \
73|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 75|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
74 76
75# compile-time-only 77# compile-time-only
76mysql_version_is_at_least "5.1.12" \ 78mysql_version_is_at_least "5.1.12" \
77&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )" 79&& 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 80
83# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 81# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
84PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 82PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
83
84# For other stuff to bring us in
85PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
85 86
86# Work out the default SERVER_URI correctly 87# Work out the default SERVER_URI correctly
87if [ -z "${SERVER_URI}" ]; then 88if [ -z "${SERVER_URI}" ]; then
88 # The community build is on the mirrors 89 # The community build is on the mirrors
89 if [ "${PN}" == "mysql-community" ]; then 90 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
90 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" 91 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
91 # The enterprise source is on the primary site only 92 # The (old) enterprise source is on the primary site only
92 elif [ "${PN}" == "mysql" ]; then 93 elif [ "${PN}" == "mysql" ]; then
93 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" 94 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
94 fi 95 fi
95fi 96fi
96 97
… …
121 122
122mysql_version_is_at_least "5.0.18" \ 123mysql_version_is_at_least "5.0.18" \
123&& IUSE="${IUSE} max-idx-128" 124&& IUSE="${IUSE} max-idx-128"
124 125
125mysql_version_is_at_least "5.1" \ 126mysql_version_is_at_least "5.1" \
126&& IUSE="${IUSE} innodb"
127
128mysql_version_is_at_least "5.1" \
129|| IUSE="${IUSE} berkdb" 127|| IUSE="${IUSE} berkdb"
130 128
131mysql_version_is_at_least "5.1.12" \ 129mysql_version_is_at_least "5.1.12" \
132&& IUSE="${IUSE} pbxt" 130&& IUSE="${IUSE} pbxt"
131
132[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
133&& IUSE="${IUSE} community profiling"
133 134
134EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 135EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
135 pkg_postinst pkg_config pkg_postrm 136 pkg_postinst pkg_config pkg_postrm
136 137
137# 138#
138# HELPER FUNCTIONS: 139# HELPER FUNCTIONS:
139# 140#
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 141
204mysql_disable_test() { 142mysql_disable_test() {
205 local testname="${1}" ; shift 143 local testname="${1}" ; shift
206 local reason="${@}" 144 local reason="${@}"
207 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 145 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
… …
240 fi 178 fi
241 elog "MySQL MY_DATADIR is ${MY_DATADIR}" 179 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
242 180
243 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 181 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
244 if [[ -e "${MY_DATADIR}" ]] ; then 182 if [[ -e "${MY_DATADIR}" ]] ; then
245 elog "Previous datadir found, it's YOUR job to change" 183 # If you get this and you're wondering about it, see bug #207636
246 elog "ownership and take care of it" 184 elog "MySQL datadir found in ${MY_DATADIR}"
185 elog "A new one will not be created."
247 PREVIOUS_DATADIR="yes" 186 PREVIOUS_DATADIR="yes"
248 else 187 else
249 PREVIOUS_DATADIR="no" 188 PREVIOUS_DATADIR="no"
250 fi 189 fi
251 export PREVIOUS_DATADIR 190 export PREVIOUS_DATADIR
191 fi
192 else
193 if [[ ${EBUILD_PHASE} == "config" ]]; then
194 local new_MY_DATADIR
195 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
196 | sed -ne '/datadir/s|^--datadir=||p' \
197 | tail -n1`
198
199 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
200 ewarn "MySQL MY_DATADIR has changed"
201 ewarn "from ${MY_DATADIR}"
202 ewarn "to ${new_MY_DATADIR}"
203 MY_DATADIR="${new_MY_DATADIR}"
204 fi
252 fi 205 fi
253 fi 206 fi
254 207
255 MY_SOURCEDIR=${SERVER_URI##*/} 208 MY_SOURCEDIR=${SERVER_URI##*/}
256 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 209 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
… …
312 mysql_version_is_at_least "4.1.3" \ 265 mysql_version_is_at_least "4.1.3" \
313 && use cluster \ 266 && use cluster \
314 && myconf="${myconf} --without-ndb-debug" 267 && myconf="${myconf} --without-ndb-debug"
315 fi 268 fi
316 269
270 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
271 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
272 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
273 ewarn "You MUST file bugs without these variables set."
274 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
275 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
317 if mysql_version_is_at_least "4.1" && ! use latin1 ; then 276 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
318 myconf="${myconf} --with-charset=utf8" 277 myconf="${myconf} --with-charset=utf8"
319 myconf="${myconf} --with-collation=utf8_general_ci" 278 myconf="${myconf} --with-collation=utf8_general_ci"
320 else 279 else
321 myconf="${myconf} --with-charset=latin1" 280 myconf="${myconf} --with-charset=latin1"
322 myconf="${myconf} --with-collation=latin1_swedish_ci" 281 myconf="${myconf} --with-collation=latin1_swedish_ci"
323 fi 282 fi
324 283
325 if use embedded ; then 284 if use embedded ; then
326 myconf="${myconf} --with-embedded-privilege-control" 285 myconf="${myconf} --with-embedded-privilege-control"
327 myconf="${myconf} --with-embedded-server" 286 myconf="${myconf} --with-embedded-server"
… …
350 myconf="${myconf} $(use_with ssl)" 309 myconf="${myconf} $(use_with ssl)"
351 else 310 else
352 myconf="${myconf} $(use_with ssl openssl)" 311 myconf="${myconf} $(use_with ssl openssl)"
353 fi 312 fi
354 313
314 if mysql_version_is_at_least "5.0.60" ; then
355 if use berkdb ; then 315 if use berkdb ; then
316 elog "Berkeley DB support was disabled due to build failures"
317 elog "on multiple arches, go to a version earlier than 5.0.60"
318 elog "if you want it again. Gentoo bug #224067."
319 fi
320 myconf="${myconf} --without-berkeley-db"
321 elif use berkdb ; then
356 # The following fix is due to a bug with bdb on SPARC's. See: 322 # The following fix is due to a bug with bdb on SPARC's. See:
357 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 323 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
358 # It comes down to non-64-bit safety problems. 324 # It comes down to non-64-bit safety problems.
359 if use alpha || use amd64 || use hppa || use mips || use sparc ; then 325 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
360 elog "Berkeley DB support was disabled due to compatibility issues on this arch" 326 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
… …
386 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html 352 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
387 if mysql_version_is_at_least "5.0.3" ; then 353 if mysql_version_is_at_least "5.0.3" ; then
388 elog "Before using the Federated storage engine, please be sure to read" 354 elog "Before using the Federated storage engine, please be sure to read"
389 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 355 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
390 myconf="${myconf} --with-federated-storage-engine" 356 myconf="${myconf} --with-federated-storage-engine"
357 fi
358 fi
359
360 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
361 myconf="${myconf} `use_enable community community-features`"
362 if use community; then
363 myconf="${myconf} `use_enable profiling`"
364 else
365 myconf="${myconf} --disable-profiling"
391 fi 366 fi
392 fi 367 fi
393 368
394 mysql_version_is_at_least "5.0.18" \ 369 mysql_version_is_at_least "5.0.18" \
395 && use max-idx-128 \ 370 && use max-idx-128 \
… …
418 393
419 elog "Before using the Federated storage engine, please be sure to read" 394 elog "Before using the Federated storage engine, please be sure to read"
420 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 395 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
421 fi 396 fi
422 397
423 if use innodb ; then 398 # Upstream specifically requests that InnoDB always be built.
424 plugins="${plugins},innobase" 399 plugins="${plugins},innobase"
425 fi
426 400
427 # like configuration=max-no-ndb 401 # like configuration=max-no-ndb
428 if use cluster ; then 402 if use cluster ; then
429 plugins="${plugins},ndbcluster" 403 plugins="${plugins},ndbcluster"
430 myconf="${myconf} --with-ndb-binlog" 404 myconf="${myconf} --with-ndb-binlog"
… …
468# 442#
469mysql_pkg_setup() { 443mysql_pkg_setup() {
470 if hasq test ${FEATURES} ; then 444 if hasq test ${FEATURES} ; then
471 if ! use minimal ; then 445 if ! use minimal ; then
472 if [[ $UID -eq 0 ]]; then 446 if [[ $UID -eq 0 ]]; then
473 die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." 447 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
474 fi 448 fi
475 fi 449 fi
476 fi 450 fi
477
478 # Bug #213475 - MySQL _will_ object strenously if your machine is named
479 # localhost. Also causes weird failures.
480 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
481 451
482 # Check for USE flag problems in pkg_setup 452 # Check for USE flag problems in pkg_setup
483 if use static && use ssl ; then 453 if use static && use ssl ; then
484 eerror "MySQL does not support being built statically with SSL support enabled!" 454 eerror "MySQL does not support being built statically with SSL support enabled!"
485 die "MySQL does not support being built statically with SSL support enabled!" 455 die "MySQL does not support being built statically with SSL support enabled!"
… …
497 && ( use cluster || use extraengine ) \ 467 && ( use cluster || use extraengine ) \
498 && use minimal ; then 468 && use minimal ; then
499 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 469 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
500 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 470 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
501 fi 471 fi
502 472
503 # This should come after all of the die statements 473 # This should come after all of the die statements
504 enewgroup mysql 60 || die "problem adding 'mysql' group" 474 enewgroup mysql 60 || die "problem adding 'mysql' group"
505 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 475 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
506 476
507 mysql_check_version_range "4.0 to 5.0.99.99" \ 477 mysql_check_version_range "4.0 to 5.0.99.99" \
… …
514 mysql_init_vars 484 mysql_init_vars
515 485
516 unpack ${A} 486 unpack ${A}
517 # Grab the patches 487 # Grab the patches
518 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack 488 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
519 # Bitkeeper checkout support 489
520 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
521 if mysql_check_version_range "5.1 to 5.1.99" ; then
522 bitkeeper_fetch "mysql-5.1-ndb"
523 elif mysql_check_version_range "5.2 to 5.2.99" ; then
524 bitkeeper_fetch "mysql-5.2-falcon"
525 else
526 bitkeeper_fetch
527 fi
528 cd "${S}"
529 einfo "Running upstream autorun over BK sources ..."
530 BUILD/autorun.sh
531 else
532 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 490 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
533 cd "${S}" 491 cd "${S}"
534 fi
535 492
536 # Apply the patches for this MySQL version 493 # Apply the patches for this MySQL version
537 EPATCH_SUFFIX="patch" 494 EPATCH_SUFFIX="patch"
538 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" 495 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
539 # Clean out old items 496 # Clean out old items
… …
565 local rebuilddirlist d 522 local rebuilddirlist d
566 523
567 if mysql_version_is_at_least "5.1.12" ; then 524 if mysql_version_is_at_least "5.1.12" ; then
568 rebuilddirlist="." 525 rebuilddirlist="."
569 # TODO: check this with a cmake expert 526 # TODO: check this with a cmake expert
570 use innodb \
571 && cmake \ 527 cmake \
572 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ 528 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
573 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \ 529 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
574 "storage/innobase" 530 "storage/innobase"
575 else 531 else
576 rebuilddirlist=". innobase" 532 rebuilddirlist=". innobase"
… …
586 if mysql_check_version_range "4.1 to 5.0.99.99" \ 542 if mysql_check_version_range "4.1 to 5.0.99.99" \
587 && use berkdb ; then 543 && use berkdb ; then
588 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 544 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
589 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 545 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
590 || die "Could not copy libtool.m4 to bdb/dist/" 546 || die "Could not copy libtool.m4 to bdb/dist/"
547 #These files exist only with libtool-2*, and need to be included.
548 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
549 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
550 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
551 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
552 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
553 fi
591 pushd "bdb/dist" &>/dev/null 554 pushd "bdb/dist" &>/dev/null
592 sh s_all \ 555 sh s_all \
593 || die "Failed bdb reconfigure" 556 || die "Failed bdb reconfigure"
594 popd &>/dev/null 557 popd &>/dev/null
595 fi 558 fi
… …
616 # Bug #114895, bug #110149 579 # Bug #114895, bug #110149
617 filter-flags "-O" "-O[01]" 580 filter-flags "-O" "-O[01]"
618 581
619 # glib-2.3.2_pre fix, bug #16496 582 # glib-2.3.2_pre fix, bug #16496
620 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 583 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
584
585 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
586 # fail badly during cluster startup.
587 if [[ $(gcc-major-version) -lt 4 ]]; then
588 filter-flags "-fstack-protector-all"
589 fi
621 590
622 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 591 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
623 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 592 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
624 mysql_version_is_at_least "5.0" \ 593 mysql_version_is_at_least "5.0" \
625 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 594 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
… …
655 624
656 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 625 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
657 626
658 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install 627 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
659 628
660 insinto "${MY_INCLUDEDIR}"
661 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
662
663 # Convenience links 629 # Convenience links
630 einfo "Making Convenience links for mysqlcheck multi-call binary"
664 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 631 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
665 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 632 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
666 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 633 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
667 634
668 # Various junk (my-*.cnf moved elsewhere) 635 # Various junk (my-*.cnf moved elsewhere)
636 einfo "Removing duplicate /usr/share/mysql files"
669 rm -Rf "${D}/usr/share/info" 637 rm -Rf "${D}/usr/share/info"
670 for removeme in "mysql-log-rotate" mysql.server* \ 638 for removeme in "mysql-log-rotate" mysql.server* \
671 binary-configure* my-*.cnf mi_test_all* 639 binary-configure* my-*.cnf mi_test_all*
672 do 640 do
673 rm -f "${D}"/usr/share/mysql/${removeme} 641 rm -f "${D}"/usr/share/mysql/${removeme}
674 done 642 done
675 643
676 # Clean up stuff for a minimal build 644 # Clean up stuff for a minimal build
677 if use minimal ; then 645 if use minimal ; then
646 einfo "Remove all extra content for minimal build"
678 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 647 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
679 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} 648 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}
680 rm -f "${D}/usr/sbin/mysqld" 649 rm -f "${D}/usr/sbin/mysqld"
681 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 650 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
682 fi 651 fi
… …
685 if mysql_version_is_at_least "4.1" ; then 654 if mysql_version_is_at_least "4.1" ; then
686 mysql_mycnf_version="4.1" 655 mysql_mycnf_version="4.1"
687 else 656 else
688 mysql_mycnf_version="4.0" 657 mysql_mycnf_version="4.0"
689 fi 658 fi
659 einfo "Building default my.cnf"
690 insinto "${MY_SYSCONFDIR}" 660 insinto "${MY_SYSCONFDIR}"
691 doins scripts/mysqlaccess.conf 661 doins scripts/mysqlaccess.conf
692 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 662 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
693 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 663 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
694 > "${TMPDIR}/my.cnf.ok" 664 > "${TMPDIR}/my.cnf.ok"
… …
697 fi 667 fi
698 newins "${TMPDIR}/my.cnf.ok" my.cnf 668 newins "${TMPDIR}/my.cnf.ok" my.cnf
699 669
700 # Minimal builds don't have the MySQL server 670 # Minimal builds don't have the MySQL server
701 if ! use minimal ; then 671 if ! use minimal ; then
672 einfo "Creating initial directories"
702 # Empty directories ... 673 # Empty directories ...
703 diropts "-m0750" 674 diropts "-m0750"
704 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 675 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
705 dodir "${MY_DATADIR}" 676 dodir "${MY_DATADIR}"
706 keepdir "${MY_DATADIR}" 677 keepdir "${MY_DATADIR}"
… …
714 chown -R mysql:mysql "${D}/${folder}" 685 chown -R mysql:mysql "${D}/${folder}"
715 done 686 done
716 fi 687 fi
717 688
718 # Docs 689 # Docs
690 einfo "Installing docs"
719 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 691 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
720 doinfo "${S}"/Docs/mysql.info 692 doinfo "${S}"/Docs/mysql.info
721 693
722 # Minimal builds don't have the MySQL server 694 # Minimal builds don't have the MySQL server
723 if ! use minimal ; then 695 if ! use minimal ; then
696 einfo "Including support files and sample configurations"
724 docinto "support-files" 697 docinto "support-files"
725 for script in \ 698 for script in \
726 "${S}"/support-files/my-*.cnf \ 699 "${S}"/support-files/my-*.cnf \
727 "${S}"/support-files/magic \ 700 "${S}"/support-files/magic \
728 "${S}"/support-files/ndb-config-2-node.ini 701 "${S}"/support-files/ndb-config-2-node.ini
… …
799 && use berkdb \ 772 && use berkdb \
800 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 773 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
801} 774}
802 775
803mysql_pkg_config() { 776mysql_pkg_config() {
777 local old_MY_DATADIR="${MY_DATADIR}"
778
804 # Make sure the vars are correctly initialized 779 # Make sure the vars are correctly initialized
805 mysql_init_vars 780 mysql_init_vars
806 781
807 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 782 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
808 783
809 if built_with_use ${CATEGORY}/${PN} minimal ; then 784 if built_with_use ${CATEGORY}/${PN} minimal ; then
810 die "Minimal builds do NOT include the MySQL server" 785 die "Minimal builds do NOT include the MySQL server"
786 fi
787
788 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
789 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
790 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
791
792 if [[ -d "${old_MY_DATADIR_s}" ]]; then
793 if [[ -d "${MY_DATADIR_s}" ]]; then
794 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
795 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
796 else
797 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
798 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
799 || die "Moving MY_DATADIR failed"
800 fi
801 else
802 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
803 if [[ -d "${MY_DATADIR_s}" ]]; then
804 ewarn "Attempting to use ${MY_DATADIR_s}"
805 else
806 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
807 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
808 fi
809 fi
811 fi 810 fi
812 811
813 local pwd1="a" 812 local pwd1="a"
814 local pwd2="b" 813 local pwd2="b"
815 local maxtry=5 814 local maxtry=5
… …
818 ewarn "You have already a MySQL database in place." 817 ewarn "You have already a MySQL database in place."
819 ewarn "(${ROOT}/${MY_DATADIR}/*)" 818 ewarn "(${ROOT}/${MY_DATADIR}/*)"
820 ewarn "Please rename or delete it if you wish to replace it." 819 ewarn "Please rename or delete it if you wish to replace it."
821 die "MySQL database already exists!" 820 die "MySQL database already exists!"
822 fi 821 fi
822
823 # Bug #213475 - MySQL _will_ object strenously if your machine is named
824 # localhost. Also causes weird failures.
825 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
823 826
824 einfo "Creating the mysql database and setting proper" 827 einfo "Creating the mysql database and setting proper"
825 einfo "permissions on it ..." 828 einfo "permissions on it ..."
826 829
827 einfo "Insert a password for the mysql 'root' user" 830 einfo "Insert a password for the mysql 'root' user"
Legend:
Removed from v.1.94  
changed lines
  Added in v.1.111
  ViewVC Help
Powered by ViewVC 1.1.13