/[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.176
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2012 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.141 2010/03/24 03:45:56 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.176 2012/11/01 20:22:57 robbat2 Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org> 7# MySQL Team <mysql-bugs@gentoo.org>
9# - Luca Longinotti <chtekk@gentoo.org> 8# Luca Longinotti <chtekk@gentoo.org>
10# - Robin H. Johnson <robbat2@gentoo.org> 9# Robin H. Johnson <robbat2@gentoo.org>
10# @AUTHOR:
11# Francesco Riosa (Retired) <vivo@gentoo.org>
11# @BLURB: This eclass provides most of the functions for mysql ebuilds 12# @BLURB: This eclass provides most of the functions for mysql ebuilds
12# @DESCRIPTION: 13# @DESCRIPTION:
13# The mysql.eclass provides almost all the code to build the mysql ebuilds 14# The mysql.eclass provides almost all the code to build the mysql ebuilds
14# including the src_unpack, src_prepare, src_configure, src_compile, 15# including the src_unpack, src_prepare, src_configure, src_compile,
15# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm 16# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
16# phase hooks. 17# phase hooks.
17 18
18WANT_AUTOCONF="latest" 19WANT_AUTOCONF="latest"
19WANT_AUTOMAKE="latest" 20WANT_AUTOMAKE="latest"
20 21
21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs 22inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs
22 23
23# Shorten the path because the socket path length must be shorter than 107 chars 24# 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 25# and we will run a mysql server during test phase
25S="${WORKDIR}/mysql" 26S="${WORKDIR}/mysql"
26 27
27[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" 28[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
28if [[ "${MY_EXTRAS_VER}" == "live" ]]; then 29if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
29 EGIT_PROJECT=mysql-extras 30 EGIT_PROJECT=mysql-extras
30 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" 31 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
31 inherit git 32 inherit git-2
32fi 33fi
33 34
34case "${EAPI:-0}" in 35case "${EAPI:-0}" in
35 2) 36 2|3|4|5)
36 EXPORT_FUNCTIONS pkg_setup \ 37 EXPORT_FUNCTIONS pkg_setup \
37 src_unpack src_prepare \ 38 src_unpack src_prepare \
38 src_configure src_compile \ 39 src_configure src_compile \
39 src_install \ 40 src_install \
40 pkg_preinst pkg_postinst \ 41 pkg_preinst pkg_postinst \
59# Upstream MySQL considers the first two parts of the version number to be the 60# Upstream MySQL considers the first two parts of the version number to be the
60# major version. Upgrades that change major version should always run 61# major version. Upgrades that change major version should always run
61# mysql_upgrade. 62# mysql_upgrade.
62MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" 63MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
63 64
65# Cluster is a special case...
66if [[ "${PN}" == "mysql-cluster" ]]; then
67 case $PV in
68 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
69 esac
70fi
71
72
64# @ECLASS-VARIABLE: MYSQL_VERSION_ID 73# @ECLASS-VARIABLE: MYSQL_VERSION_ID
65# @DESCRIPTION: 74# @DESCRIPTION:
66# MYSQL_VERSION_ID will be: 75# MYSQL_VERSION_ID will be:
67# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 76# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
68# This is an important part, because many of the choices the MySQL ebuild will do 77# This is an important part, because many of the choices the MySQL ebuild will do
95 MYSQL_COMMUNITY_FEATURES=1 104 MYSQL_COMMUNITY_FEATURES=1
96elif [ "${PV#5.4}" != "${PV}" ] ; then 105elif [ "${PV#5.4}" != "${PV}" ] ; then
97 MYSQL_COMMUNITY_FEATURES=1 106 MYSQL_COMMUNITY_FEATURES=1
98elif [ "${PV#5.5}" != "${PV}" ] ; then 107elif [ "${PV#5.5}" != "${PV}" ] ; then
99 MYSQL_COMMUNITY_FEATURES=1 108 MYSQL_COMMUNITY_FEATURES=1
100elif [ "${PV#6.0}" != "${PV}" ] ; then 109elif [ "${PV#6}" != "${PV}" ] ; then
110 MYSQL_COMMUNITY_FEATURES=1
111elif [ "${PV#7}" != "${PV}" ] ; then
101 MYSQL_COMMUNITY_FEATURES=1 112 MYSQL_COMMUNITY_FEATURES=1
102else 113else
103 MYSQL_COMMUNITY_FEATURES=0 114 MYSQL_COMMUNITY_FEATURES=0
104fi 115fi
105 116
114PERCONA_VER="${PERCONA_VER}" 125PERCONA_VER="${PERCONA_VER}"
115 126
116# Be warned, *DEPEND are version-dependant 127# Be warned, *DEPEND are version-dependant
117# These are used for both runtime and compiletime 128# These are used for both runtime and compiletime
118DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 129DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
119 userland_GNU? ( sys-process/procps ) 130 kernel_linux? ( sys-process/procps )
120 >=sys-apps/sed-4 131 >=sys-apps/sed-4
121 >=sys-apps/texinfo-4.7-r1 132 >=sys-apps/texinfo-4.7-r1
122 >=sys-libs/readline-4.1 133 >=sys-libs/readline-4.1
123 >=sys-libs/zlib-1.2.3" 134 >=sys-libs/zlib-1.2.3"
124 135
125[[ "${PN}" == "mariadb" ]] \ 136[[ "${PN}" == "mariadb" ]] \
126&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" 137&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
127 138
128# Having different flavours at the same time is not a good idea 139# Having different flavours at the same time is not a good idea
129for i in "mysql" "mysql-community" "mariadb" ; do 140for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
130 [[ "${i}" == ${PN} ]] || 141 [[ "${i}" == ${PN} ]] ||
131 DEPEND="${DEPEND} !dev-db/${i}" 142 DEPEND="${DEPEND} !dev-db/${i}"
132done 143done
133 144
145# prefix: first need to implement something for #196294
134RDEPEND="${DEPEND} 146RDEPEND="${DEPEND}
135 !minimal? ( dev-db/mysql-init-scripts ) 147 !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
136 selinux? ( sec-policy/selinux-mysql )" 148 selinux? ( sec-policy/selinux-mysql )"
149
150DEPEND="${DEPEND}
151 virtual/yacc"
152
153if [ "${EAPI:-0}" = "2" ]; then
154 DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
155fi
137 156
138# compile-time-only 157# compile-time-only
139mysql_version_is_at_least "5.1" \ 158mysql_version_is_at_least "5.1" \
140|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 159|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
141 160
142# compile-time-only 161# compile-time-only
143mysql_version_is_at_least "5.1.12" \ 162mysql_version_is_at_least "5.1.12" \
144&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" 163&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
164
165[[ "${PN}" == "mariadb" ]] \
166&& mysql_version_is_at_least "5.2" \
167&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
168#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
169# sphinx? ( app-misc/sphinx )"
145 170
146# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 171# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
147PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 172PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
148 173
149# For other stuff to bring us in 174# For other stuff to bring us in
152# Work out the default SERVER_URI correctly 177# Work out the default SERVER_URI correctly
153if [ -z "${SERVER_URI}" ]; then 178if [ -z "${SERVER_URI}" ]; then
154 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" 179 [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
155 if [ "${PN}" == "mariadb" ]; then 180 if [ "${PN}" == "mariadb" ]; then
156 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})" 181 MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
182 MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
183 SERVER_URI="
184 http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
185 http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
186 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" 187 http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
188 http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
189 http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
190 "
158 # The community build is on the mirrors 191 # The community and cluster builds are on the mirrors
159 elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 192 elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
160 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz" 193 if [[ "${PN}" == "mysql-cluster" ]] ; then
194 URI_DIR="MySQL-Cluster"
195 URI_FILE="mysql-cluster-gpl"
196 else
197 URI_DIR="MySQL"
198 URI_FILE="mysql"
199 fi
200 URI_A="${URI_FILE}-${MY_PV}.tar.gz"
201 MIRROR_PV=$(get_version_component_range 1-2 ${PV})
202 # Recently upstream switched to an archive site, and not on mirrors
203 SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
204 mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
161 # The (old) enterprise source is on the primary site only 205 # The (old) enterprise source is on the primary site only
162 elif [ "${PN}" == "mysql" ]; then 206 elif [ "${PN}" == "mysql" ]; then
163 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz" 207 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
164 fi 208 fi
165fi 209fi
178HOMEPAGE="http://www.mysql.com/" 222HOMEPAGE="http://www.mysql.com/"
179if [[ "${PN}" == "mariadb" ]]; then 223if [[ "${PN}" == "mariadb" ]]; then
180 HOMEPAGE="http://askmonty.org/" 224 HOMEPAGE="http://askmonty.org/"
181 DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged." 225 DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
182fi 226fi
227if [[ "${PN}" == "mysql-community" ]]; then
228 DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
229fi
183LICENSE="GPL-2" 230LICENSE="GPL-2"
184SLOT="0" 231SLOT="0"
185IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test" 232IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
186 233
187mysql_version_is_at_least "4.1" \ 234mysql_version_is_at_least "4.1" \
188&& IUSE="${IUSE} latin1" 235&& IUSE="${IUSE} latin1"
189 236
190mysql_version_is_at_least "4.1.3" \ 237if mysql_version_is_at_least "4.1.3" ; then
191&& IUSE="${IUSE} cluster extraengine" 238 IUSE="${IUSE} extraengine"
239 if [[ "${PN}" != "mysql-cluster" ]] ; then
240 IUSE="${IUSE} cluster"
241 fi
242fi
192 243
193mysql_version_is_at_least "5.0" \ 244mysql_version_is_at_least "5.0" \
194|| IUSE="${IUSE} raid" 245|| IUSE="${IUSE} raid"
195 246
196mysql_version_is_at_least "5.0.18" \ 247mysql_version_is_at_least "5.0.18" \
202[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ 253[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
203&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" 254&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
204 255
205[[ "${PN}" == "mariadb" ]] \ 256[[ "${PN}" == "mariadb" ]] \
206&& IUSE="${IUSE} libevent" 257&& IUSE="${IUSE} libevent"
258
259[[ "${PN}" == "mariadb" ]] \
260&& mysql_version_is_at_least "5.2" \
261&& IUSE="${IUSE} oqgraph"
262#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
263#&& IUSE="${IUSE} oqgraph sphinx"
207 264
208# MariaDB has integrated PBXT 265# MariaDB has integrated PBXT
209# PBXT_VERSION means that we have a PBXT patch for this PV 266# PBXT_VERSION means that we have a PBXT patch for this PV
210# PBXT was only introduced after 5.1.12 267# PBXT was only introduced after 5.1.12
211pbxt_patch_available() { 268pbxt_patch_available() {
229 && mysql_version_is_at_least "5.1.26" \ 286 && mysql_version_is_at_least "5.1.26" \
230 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] 287 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
231 return $? 288 return $?
232} 289}
233 290
291
234pbxt_patch_available \ 292pbxt_patch_available \
235&& PBXT_P="pbxt-${PBXT_VERSION}" \ 293&& 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" \ 294&& 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} )" \ 295&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
238 296
297# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
298# vs. built outside the dir
239pbxt_available \ 299pbxt_available \
240&& IUSE="${IUSE} pbxt" 300&& IUSE="${IUSE} pbxt" \
301&& mysql_version_is_at_least "5.1.40" \
302&& PBXT_NEWSTYLE=1
241 303
242xtradb_patch_available \ 304xtradb_patch_available \
243&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \ 305&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
244&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \ 306&& 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}" \ 307&& XTRADB_SRC_B1="http://www.percona.com/" \
308&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
309&& 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}" \ 310&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
311&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
247&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \ 312&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
248&& IUSE="${IUSE} xtradb" 313&& IUSE="${IUSE} xtradb"
249 314
250# 315#
251# HELPER FUNCTIONS: 316# HELPER FUNCTIONS:
252# 317#
257mysql_disable_test() { 322mysql_disable_test() {
258 local rawtestname testname testsuite reason mysql_disable_file 323 local rawtestname testname testsuite reason mysql_disable_file
259 rawtestname="${1}" ; shift 324 rawtestname="${1}" ; shift
260 reason="${@}" 325 reason="${@}"
261 ewarn "test '${rawtestname}' disabled: '${reason}'" 326 ewarn "test '${rawtestname}' disabled: '${reason}'"
262 327
263 testsuite="${rawtestname/.*}" 328 testsuite="${rawtestname/.*}"
264 testname="${rawtestname/*.}" 329 testname="${rawtestname/*.}"
265 mysql_disable_file="${S}/mysql-test/t/disabled.def" 330 mysql_disable_file="${S}/mysql-test/t/disabled.def"
266 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" 331 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
267 echo ${testname} : ${reason} >> "${mysql_disable_file}" 332 echo ${testname} : ${reason} >> "${mysql_disable_file}"
297# @DESCRIPTION: 362# @DESCRIPTION:
298# void mysql_init_vars() 363# void mysql_init_vars()
299# Initialize global variables 364# Initialize global variables
300# 2005-11-19 <vivo@gentoo.org> 365# 2005-11-19 <vivo@gentoo.org>
301mysql_init_vars() { 366mysql_init_vars() {
302 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"} 367 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
303 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} 368 MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
304 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 369 MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
305 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 370 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
306 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 371 MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
307 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 372 MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
308 373
309 if [[ -z "${MY_DATADIR}" ]] ; then 374 if [[ -z "${MY_DATADIR}" ]] ; then
310 MY_DATADIR="" 375 MY_DATADIR=""
311 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 376 if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
312 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 377 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
313 | sed -ne '/datadir/s|^--datadir=||p' \ 378 | sed -ne '/datadir/s|^--datadir=||p' \
314 | tail -n1` 379 | tail -n1`
315 if [[ -z "${MY_DATADIR}" ]] ; then 380 if [[ -z "${MY_DATADIR}" ]] ; then
316 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 381 MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
317 | sed -e 's/.*=\s*//' \ 382 | sed -e 's/.*=\s*//' \
318 | tail -n1` 383 | tail -n1`
319 fi 384 fi
320 fi 385 fi
321 if [[ -z "${MY_DATADIR}" ]] ; then 386 if [[ -z "${MY_DATADIR}" ]] ; then
349 MY_DATADIR="${new_MY_DATADIR}" 414 MY_DATADIR="${new_MY_DATADIR}"
350 fi 415 fi
351 fi 416 fi
352 fi 417 fi
353 418
419 if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
354 MY_SOURCEDIR=${SERVER_URI##*/} 420 MY_SOURCEDIR=${SERVER_URI##*/}
355 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 421 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
422 fi
356 423
357 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 424 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
358 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 425 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
359 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR 426 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
360} 427}
391 myconf="${myconf} $(use_with big-tables)" 458 myconf="${myconf} $(use_with big-tables)"
392 myconf="${myconf} --enable-local-infile" 459 myconf="${myconf} --enable-local-infile"
393 myconf="${myconf} --with-extra-charsets=all" 460 myconf="${myconf} --with-extra-charsets=all"
394 myconf="${myconf} --with-mysqld-user=mysql" 461 myconf="${myconf} --with-mysqld-user=mysql"
395 myconf="${myconf} --with-server" 462 myconf="${myconf} --with-server"
396 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 463 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
397 myconf="${myconf} --without-libwrap" 464 myconf="${myconf} --without-libwrap"
398 465
399 if use static ; then 466 if use static ; then
400 myconf="${myconf} --with-mysqld-ldflags=-all-static" 467 myconf="${myconf} --with-mysqld-ldflags=-all-static"
401 myconf="${myconf} --with-client-ldflags=-all-static" 468 myconf="${myconf} --with-client-ldflags=-all-static"
407 if use debug ; then 474 if use debug ; then
408 myconf="${myconf} --with-debug=full" 475 myconf="${myconf} --with-debug=full"
409 else 476 else
410 myconf="${myconf} --without-debug" 477 myconf="${myconf} --without-debug"
411 mysql_version_is_at_least "4.1.3" \ 478 mysql_version_is_at_least "4.1.3" \
412 && use cluster \ 479 && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
413 && myconf="${myconf} --without-ndb-debug" 480 && myconf="${myconf} --without-ndb-debug"
414 fi 481 fi
415 482
416 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then 483 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
417 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" 484 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
436 fi 503 fi
437 504
438} 505}
439 506
440configure_40_41_50() { 507configure_40_41_50() {
508 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
441 myconf="${myconf} $(use_with perl bench)" 509 myconf="${myconf} $(use_with perl bench)"
442 myconf="${myconf} --enable-assembler" 510 myconf="${myconf} --enable-assembler"
443 myconf="${myconf} --with-extra-tools" 511 myconf="${myconf} --with-extra-tools"
444 myconf="${myconf} --with-innodb" 512 myconf="${myconf} --with-innodb"
445 myconf="${myconf} --without-readline" 513 myconf="${myconf} --without-readline"
446 myconf="${myconf} $(use_with ssl openssl)" 514 myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
447 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 515 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
448 516
449 # --with-vio is not needed anymore, it's on by default and 517 # --with-vio is not needed anymore, it's on by default and
450 # has been removed from configure 518 # has been removed from configure
451 # Apply to 4.x and 5.0.[0-3] 519 # Apply to 4.x and 5.0.[0-3]
474 myconf="${myconf} --without-berkeley-db" 542 myconf="${myconf} --without-berkeley-db"
475 fi 543 fi
476 544
477 if mysql_version_is_at_least "4.1.3" ; then 545 if mysql_version_is_at_least "4.1.3" ; then
478 myconf="${myconf} --with-geometry" 546 myconf="${myconf} --with-geometry"
547 if [[ "${PN}" != "mysql-cluster" ]] ; then
479 myconf="${myconf} $(use_with cluster ndbcluster)" 548 myconf="${myconf} $(use_with cluster ndbcluster)"
549 fi
480 fi 550 fi
481 551
482 if mysql_version_is_at_least "4.1.3" && use extraengine ; then 552 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
483 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 553 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
484 myconf="${myconf} --with-archive-storage-engine" 554 myconf="${myconf} --with-archive-storage-engine"
515 585
516configure_51() { 586configure_51() {
517 # TODO: !!!! readd --without-readline 587 # TODO: !!!! readd --without-readline
518 # the failure depend upon config/ac-macros/readline.m4 checking into 588 # the failure depend upon config/ac-macros/readline.m4 checking into
519 # readline.h instead of history.h 589 # readline.h instead of history.h
520 myconf="${myconf} $(use_with ssl ssl /usr)" 590 myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
521 myconf="${myconf} --enable-assembler" 591 myconf="${myconf} --enable-assembler"
522 myconf="${myconf} --with-geometry" 592 myconf="${myconf} --with-geometry"
523 myconf="${myconf} --with-readline" 593 myconf="${myconf} --with-readline"
524 myconf="${myconf} --with-zlib-dir=/usr/" 594 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
525 myconf="${myconf} --without-pstack" 595 myconf="${myconf} --without-pstack"
596 myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
597
598 # This is an explict die here, because if we just forcibly disable it, then the
599 # user's data is not accessible.
600 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
526 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 601 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
527 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 602 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
528 myconf="${myconf} $(use_enable community community-features)" 603 myconf="${myconf} $(use_enable community community-features)"
529 if use community; then 604 if use community; then
530 myconf="${myconf} $(use_enable profiling)" 605 myconf="${myconf} $(use_enable profiling)"
531 else 606 else
532 myconf="${myconf} --disable-profiling" 607 myconf="${myconf} --disable-profiling"
533 fi 608 fi
534 fi 609 fi
535 610
611 # Scan for all available plugins
612 local plugins_avail="$(
613 LANG=C \
614 find "${S}" \
615 \( \
616 -name 'plug.in' \
617 -o -iname 'configure.in' \
618 -o -iname 'configure.ac' \
619 \) \
620 -print0 \
621 | xargs -0 sed -r -n \
622 -e '/^MYSQL_STORAGE_ENGINE/{
623 s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
624 s~^([^ ]+).*~\1~gp;
625 }' \
626 | tr -s '\n' ' '
627 )"
628
536 # 5.1 introduces a new way to manage storage engines (plugins) 629 # 5.1 introduces a new way to manage storage engines (plugins)
537 # like configuration=none 630 # like configuration=none
538 # This base set are required, and will always be statically built. 631 # This base set are required, and will always be statically built.
539 local plugins="csv,myisam,myisammrg,heap" 632 local plugins_sta="csv myisam myisammrg heap"
633 local plugins_dyn=""
634 local plugins_dis="example ibmdb2i"
635
636 # These aren't actually required by the base set, but are really useful:
637 plugins_sta="${plugins_sta} archive blackhole"
638
639 # default in 5.5.4
640 if mysql_version_is_at_least "5.5.4" ; then
641 plugins_sta="${plugins_sta} partition"
642 fi
643 # Now the extras
540 if use extraengine ; then 644 if use extraengine ; then
541 # like configuration=max-no-ndb, archive and example removed in 5.1.11 645 # like configuration=max-no-ndb, archive and example removed in 5.1.11
542 # not added yet: ibmdb2i 646 # not added yet: ibmdb2i
543 # Not supporting as examples: example,daemon_example,ftexample 647 # Not supporting as examples: example,daemon_example,ftexample
544 plugins="${plugins},archive,blackhole,federated,partition" 648 plugins_sta="${plugins_sta} partition"
545 649
546 if [[ "${PN}" != "mariadb" ]] ; then 650 if [[ "${PN}" != "mariadb" ]] ; then
547 elog "Before using the Federated storage engine, please be sure to read" 651 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" 652 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
653 plugins_dyn="${plugins_sta} federated"
549 else 654 else
550 elog "MariaDB includes the FederatedX engine. Be sure to read" 655 elog "MariaDB includes the FederatedX engine. Be sure to read"
551 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine" 656 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
657 plugins_dyn="${plugins_sta} federatedx"
552 fi 658 fi
659 else
660 plugins_dis="${plugins_dis} partition federated"
553 fi 661 fi
554 662
555 # Upstream specifically requests that InnoDB always be built: 663 # Upstream specifically requests that InnoDB always be built:
556 # - innobase, innodb_plugin 664 # - innobase, innodb_plugin
557 # Build falcon if available for 6.x series. 665 # Build falcon if available for 6.x series.
558 for i in innobase innodb_plugin falcon ; do 666 for i in innobase falcon ; do
559 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}" 667 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
560 done 668 done
669 for i in innodb_plugin ; do
670 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
671 done
561 672
562 # like configuration=max-no-ndb 673 # like configuration=max-no-ndb
563 if use cluster ; then 674 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
564 plugins="${plugins},ndbcluster" 675 plugins_sta="${plugins_sta} ndbcluster partition"
676 plugins_dis="${plugins_dis//partition}"
565 myconf="${myconf} --with-ndb-binlog" 677 myconf="${myconf} --with-ndb-binlog"
678 else
679 plugins_dis="${plugins_dis} ndbcluster"
566 fi 680 fi
567 681
568 if [[ "${PN}" == "mariadb" ]] ; then 682 if [[ "${PN}" == "mariadb" ]] ; then
569 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not 683 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
570 # caught above. 684 # caught above.
571 plugins="${plugins},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)"
578 # This is not optional, without it several upstream testcases fail. 685 # This is not optional, without it several upstream testcases fail.
579 # Also strongly recommended by upstream. 686 # Also strongly recommended by upstream.
687 if [[ "${PV}" < "5.2.0" ]] ; then
580 myconf="${myconf} --with-maria-tmp-tables" 688 myconf="${myconf} --with-maria-tmp-tables"
689 plugins_sta="${plugins_sta} maria"
690 else
691 myconf="${myconf} --with-aria-tmp-tables"
692 plugins_sta="${plugins_sta} aria"
581 fi 693 fi
582 694
695 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
696 die "The ${P} package doesn't provide innobase nor xtradb"
697
698 for i in innobase xtradb ; do
699 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
700 done
701
702 myconf="${myconf} $(use_with libevent)"
703
704 if mysql_version_is_at_least "5.2" ; then
705 #This should include sphinx, but the 5.2.4 archive forgot the plug.in file
706 #for i in oqgraph sphinx ; do
707 for i in oqgraph ; do
708 use ${i} \
709 && plugins_dyn="${plugins_dyn} ${i}" \
710 || plugins_dis="${plugins_dis} ${i}"
711 done
712 fi
713 fi
714
715 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
716 use pbxt \
717 && plugins_sta="${plugins_sta} pbxt" \
718 || plugins_dis="${plugins_dis} pbxt"
719 fi
720
721 use static && \
722 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
723 plugins_dyn=""
724
725 einfo "Available plugins: ${plugins_avail}"
726 einfo "Dynamic plugins: ${plugins_dyn}"
727 einfo "Static plugins: ${plugins_sta}"
728 einfo "Disabled plugins: ${plugins_dis}"
729
730 # These are the static plugins
583 myconf="${myconf} --with-plugins=${plugins}" 731 myconf="${myconf} --with-plugins=${plugins_sta// /,}"
732 # And the disabled ones
733 for i in ${plugins_dis} ; do
734 myconf="${myconf} --without-plugin-${i}"
735 done
584} 736}
585 737
586pbxt_src_configure() { 738pbxt_src_configure() {
587 mysql_init_vars 739 mysql_init_vars
588 740
589 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 741 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
590 742
591 einfo "Reconfiguring dir '${PWD}'" 743 einfo "Reconfiguring dir '${PWD}'"
592 AT_GNUCONF_UPDATE="yes" eautoreconf 744 eautoreconf
593 745
594 local myconf="" 746 local myconf=""
595 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 747 myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
596 use debug && myconf="${myconf} --with-debug=full" 748 use debug && myconf="${myconf} --with-debug=full"
597 econf ${myconf} || die "Problem configuring PBXT storage engine" 749 econf ${myconf} || die "Problem configuring PBXT storage engine"
598} 750}
599 751
600pbxt_src_compile() { 752pbxt_src_compile() {
753
601 # Be backwards compatible for now 754 # Be backwards compatible for now
602 if [[ $EAPI != 2 ]]; then 755 if [[ $EAPI != 2 ]]; then
603 pbxt_src_configure 756 pbxt_src_configure
604 fi 757 fi
605 # TODO: is it safe/needed to use emake here ? 758 # TODO: is it safe/needed to use emake here ?
624# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" 777# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
625# check for conflicting use flags 778# check for conflicting use flags
626# create new user and group for mysql 779# create new user and group for mysql
627# warn about deprecated features 780# warn about deprecated features
628mysql_pkg_setup() { 781mysql_pkg_setup() {
629 if hasq test ${FEATURES} ; then 782 if has test ${FEATURES} ; then
630 if ! use minimal ; then 783 if ! use minimal ; then
631 if [[ $UID -eq 0 ]]; then 784 if [[ $UID -eq 0 ]]; then
632 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." 785 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
633 fi 786 fi
634 fi 787 fi
635 fi 788 fi
636 789
790 # bug 350844
791 case "${EAPI:-0}" in
792 0 | 1)
793 if use static && ! built_with_use sys-libs/ncurses static-libs; then
794 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
795 fi
796 ;;
797 esac
798
637 # Check for USE flag problems in pkg_setup 799 # Check for USE flag problems in pkg_setup
638 if use static && use ssl ; then 800 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!" 801 M="MySQL does not support being built statically with SSL support enabled!"
802 eerror "${M}"
803 die "${M}"
804 fi
805
806 if mysql_version_is_at_least "5.1.51" \
807 && ! mysql_version_is_at_least "5.2" \
808 && use debug ; then
809 # Also in package.use.mask
810 die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
641 fi 811 fi
642 812
643 if ! mysql_version_is_at_least "5.0" \ 813 if ! mysql_version_is_at_least "5.0" \
644 && use raid \ 814 && use raid \
645 && use static ; then 815 && use static ; then
647 eerror "with RAID support enabled." 817 eerror "with RAID support enabled."
648 die "USE flags 'raid' and 'static' conflict!" 818 die "USE flags 'raid' and 'static' conflict!"
649 fi 819 fi
650 820
651 if mysql_version_is_at_least "4.1.3" \ 821 if mysql_version_is_at_least "4.1.3" \
652 && ( use cluster || use extraengine ) \ 822 && ( use cluster || use extraengine || use embedded ) \
653 && use minimal ; then 823 && 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!" 824 M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
825 eerror "${M}"
826 die "${M}"
656 fi 827 fi
657 828
658 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
659 if mysql_version_is_at_least "5.0.83" ; then 829 if mysql_version_is_at_least "5.1" \
830 && xtradb_patch_available \
831 && use xtradb \
832 && use embedded ; then
833 M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
834 eerror "${M}"
835 die "${M}"
836 fi
837
838 # Bug #290570, 284946, 307251
839 # Upstream changes made us need a fairly new GCC4.
840 # But only for 5.0.8[3-6]!
841 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
660 GCC_VER=$(gcc-version) 842 GCC_VER=$(gcc-version)
661 case ${GCC_VER} in 843 case ${CHOST}:${GCC_VER} in
662 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;; 844 *-darwin*:4.*) : ;; # bug #310615
845 *:2*|*:3*|*:4.0|*:4.1|*:4.2)
846 eerror "Some releases of MySQL required a very new GCC, and then"
847 eerror "later release relaxed that requirement again. Either pick a"
848 eerror "MySQL >=5.0.87, or use a newer GCC."
849 die "Active GCC too old!" ;;
663 esac 850 esac
664 fi 851 fi
665 852
666 # This should come after all of the die statements 853 # This should come after all of the die statements
667 enewgroup mysql 60 || die "problem adding 'mysql' group" 854 enewgroup mysql 60 || die "problem adding 'mysql' group"
717 mysql_mv_patches 904 mysql_mv_patches
718 # And apply 905 # And apply
719 epatch 906 epatch
720 907
721 # last -fPIC fixup, per bug #305873 908 # last -fPIC fixup, per bug #305873
722 i="${S}"/storage/innodb_plugin/plug.in 909 i="${S}"/storage/innodb_plugin/plug.in
723 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" 910 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
724 911
725 # Additional checks, remove bundled zlib 912 # Additional checks, remove bundled zlib (Cluster needs this, for static
913 # memory management in zlib, leave available for Cluster)
914 if [[ "${PN}" != "mysql-cluster" ]] ; then
726 rm -f "${S}/zlib/"*.[ch] 915 rm -f "${S}/zlib/"*.[ch]
727 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 916 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
917 fi
728 rm -f "scripts/mysqlbug" 918 rm -f "scripts/mysqlbug"
729 919
730 # Make charsets install in the right place 920 # Make charsets install in the right place
731 find . -name 'Makefile.am' \ 921 find . -name 'Makefile.am' \
732 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 922 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
743 fi 933 fi
744 934
745 local rebuilddirlist d 935 local rebuilddirlist d
746 936
747 if xtradb_patch_available && use xtradb ; then 937 if xtradb_patch_available && use xtradb ; then
748 einfo "Replacing InnoDB with Percona XtraDB" 938 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
749 pushd "${S}"/storage 939 pushd "${S}"/storage >/dev/null
750 i="innobase" 940 i="innobase"
751 o="${WORKDIR}/storage-${i}.mysql-upstream" 941 o="${WORKDIR}/storage-${i}.mysql-upstream"
752 # Have we been here already? 942 # Have we been here already?
753 [ -d "${o}" ] && rm -f "${i}" 943 [ -d "${o}" ] && rm -f "${i}"
754 # Or maybe we haven't 944 # Or maybe we haven't
755 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 945 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
756 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}" 946 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
757 popd 947 popd >/dev/null
948 fi
949
950 if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
951 einfo "Adding storage engine: PBXT"
952 pushd "${S}"/storage >/dev/null
953 i='pbxt'
954 [ -d "${i}" ] && rm -rf "${i}"
955 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
956 popd >/dev/null
758 fi 957 fi
759 958
760 if mysql_version_is_at_least "5.1.12" ; then 959 if mysql_version_is_at_least "5.1.12" ; then
761 rebuilddirlist="." 960 rebuilddirlist="."
762 # This does not seem to be needed presently. robbat2 2010/02/23 961 # This does not seem to be needed presently. robbat2 2010/02/23
771 fi 970 fi
772 971
773 for d in ${rebuilddirlist} ; do 972 for d in ${rebuilddirlist} ; do
774 einfo "Reconfiguring dir '${d}'" 973 einfo "Reconfiguring dir '${d}'"
775 pushd "${d}" &>/dev/null 974 pushd "${d}" &>/dev/null
776 AT_GNUCONF_UPDATE="yes" eautoreconf 975 eautoreconf
777 popd &>/dev/null 976 popd &>/dev/null
778 done 977 done
779 978
780 if mysql_check_version_range "4.1 to 5.0.99.99" \ 979 if mysql_check_version_range "4.1 to 5.0.99.99" \
781 && use berkdb ; then 980 && use berkdb ; then
782 einfo "Fixing up berkdb buildsystem" 981 einfo "Fixing up berkdb buildsystem"
783 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 982 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
784 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 983 cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
785 || die "Could not copy libtool.m4 to bdb/dist/" 984 || die "Could not copy libtool.m4 to bdb/dist/"
786 #These files exist only with libtool-2*, and need to be included. 985 #These files exist only with libtool-2*, and need to be included.
787 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 986 if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
788 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" 987 cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
789 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" 988 cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
790 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac" 989 cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
791 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" 990 cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
792 fi 991 fi
793 pushd "bdb/dist" &>/dev/null 992 pushd "bdb/dist" &>/dev/null
794 sh s_all \ 993 sh s_all \
795 || die "Failed bdb reconfigure" 994 || die "Failed bdb reconfigure"
796 popd &>/dev/null 995 popd &>/dev/null
837 export CXXFLAGS 1036 export CXXFLAGS
838 1037
839 # bug #283926, with GCC4.4, this is required to get correct behavior. 1038 # bug #283926, with GCC4.4, this is required to get correct behavior.
840 append-flags -fno-strict-aliasing 1039 append-flags -fno-strict-aliasing
841 1040
1041 # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
1042 # causes a mis-compile.
1043 # Upstream bugs:
1044 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
1045 # http://bugs.mysql.com/bug.php?id=45205
1046 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
1047 append-flags -fno-omit-frame-pointer && \
1048 filter-flags -fomit-frame-pointer
1049
842 econf \ 1050 econf \
843 --libexecdir="/usr/sbin" \ 1051 --libexecdir="${EPREFIX}"/usr/sbin \
844 --sysconfdir="${MY_SYSCONFDIR}" \ 1052 --sysconfdir=${MY_SYSCONFDIR} \
845 --localstatedir="${MY_LOCALSTATEDIR}" \ 1053 --localstatedir=${MY_LOCALSTATEDIR} \
846 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1054 --sharedstatedir=${MY_SHAREDSTATEDIR} \
847 --libdir="${MY_LIBDIR}" \ 1055 --libdir=${MY_LIBDIR} \
848 --includedir="${MY_INCLUDEDIR}" \ 1056 --includedir=${MY_INCLUDEDIR} \
849 --with-low-memory \ 1057 --with-low-memory \
850 --with-client-ldflags=-lstdc++ \ 1058 --with-client-ldflags=-lstdc++ \
851 --enable-thread-safe-client \ 1059 --enable-thread-safe-client \
852 --with-comment="Gentoo Linux ${PF}" \ 1060 --with-comment="Gentoo Linux ${PF}" \
853 --without-docs \ 1061 --without-docs \
1062 --with-LIBDIR="$(get_libdir)" \
854 ${myconf} || die "econf failed" 1063 ${myconf} || die "econf failed"
855 1064
856 # TODO: Move this before autoreconf !!! 1065 # TODO: Move this before autoreconf !!!
857 find . -type f -name Makefile -print0 \ 1066 find . -type f -name Makefile -print0 \
858 | xargs -0 -n100 sed -i \ 1067 | xargs -0 -n100 sed -i \
859 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 1068 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
860 1069
861 if [[ $EAPI == 2 ]]; then 1070 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
862 pbxt_patch_available && use pbxt && pbxt_src_configure 1071 pbxt_patch_available && use pbxt && pbxt_src_configure
863 fi 1072 fi
864} 1073}
865 1074
866# @FUNCTION: mysql_src_compile 1075# @FUNCTION: mysql_src_compile
873 0 | 1) mysql_src_configure ;; 1082 0 | 1) mysql_src_configure ;;
874 esac 1083 esac
875 1084
876 emake || die "emake failed" 1085 emake || die "emake failed"
877 1086
1087 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
878 pbxt_patch_available && use pbxt && pbxt_src_compile 1088 pbxt_patch_available && use pbxt && pbxt_src_compile
1089 fi
879} 1090}
880 1091
881# @FUNCTION: mysql_src_install 1092# @FUNCTION: mysql_src_install
882# @DESCRIPTION: 1093# @DESCRIPTION:
883# Install mysql. 1094# Install mysql.
885 # Make sure the vars are correctly initialized 1096 # Make sure the vars are correctly initialized
886 mysql_init_vars 1097 mysql_init_vars
887 1098
888 emake install \ 1099 emake install \
889 DESTDIR="${D}" \ 1100 DESTDIR="${D}" \
890 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1101 benchdir_root=${MY_SHAREDSTATEDIR} \
891 testroot="${MY_SHAREDSTATEDIR}" \ 1102 testroot="${MY_SHAREDSTATEDIR}" \
892 || die "emake install failed" 1103 || die "emake install failed"
893 1104
1105 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
894 pbxt_patch_available && use pbxt && pbxt_src_install 1106 pbxt_patch_available && use pbxt && pbxt_src_install
1107 fi
895 1108
896 # Convenience links 1109 # Convenience links
897 einfo "Making Convenience links for mysqlcheck multi-call binary" 1110 einfo "Making Convenience links for mysqlcheck multi-call binary"
898 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1111 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
899 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1112 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
900 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 1113 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
901 1114
902 # Various junk (my-*.cnf moved elsewhere) 1115 # Various junk (my-*.cnf moved elsewhere)
903 einfo "Removing duplicate /usr/share/mysql files" 1116 einfo "Removing duplicate /usr/share/mysql files"
904 rm -Rf "${D}/usr/share/info" 1117 rm -Rf "${ED}/usr/share/info"
905 for removeme in "mysql-log-rotate" mysql.server* \ 1118 for removeme in "mysql-log-rotate" mysql.server* \
906 binary-configure* my-*.cnf mi_test_all* 1119 binary-configure* my-*.cnf mi_test_all*
907 do 1120 do
908 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} 1121 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
909 done 1122 done
910 1123
911 # Clean up stuff for a minimal build 1124 # Clean up stuff for a minimal build
912 if use minimal ; then 1125 if use minimal ; then
913 einfo "Remove all extra content for minimal build" 1126 einfo "Remove all extra content for minimal build"
914 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 1127 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
915 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} 1128 rm -f "${ED}"/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}
916 rm -f "${D}/usr/sbin/mysqld" 1129 rm -f "${ED}/usr/sbin/mysqld"
917 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 1130 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
918 fi 1131 fi
919 1132
920 # Unless they explicitly specific USE=test, then do not install the 1133 # Unless they explicitly specific USE=test, then do not install the
921 # testsuite. It DOES have a use to be installed, esp. when you want to do a 1134 # testsuite. It DOES have a use to be installed, esp. when you want to do a
923 if use !test ; then 1136 if use !test ; then
924 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test 1137 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
925 fi 1138 fi
926 1139
927 # Configuration stuff 1140 # Configuration stuff
928 if mysql_version_is_at_least "5.1" ; then 1141 case ${MYSQL_PV_MAJOR} in
929 mysql_mycnf_version="5.1"
930 elif mysql_version_is_at_least "4.1" ; then
931 mysql_mycnf_version="4.1"
932 else
933 mysql_mycnf_version="4.0" 1142 3*|4.0) mysql_mycnf_version="4.0" ;;
934 fi 1143 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
935 einfo "Building default my.cnf" 1144 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1145 esac
1146 einfo "Building default my.cnf (${mysql_mycnf_version})"
936 insinto "${MY_SYSCONFDIR}" 1147 insinto "${MY_SYSCONFDIR#${EPREFIX}}"
937 doins scripts/mysqlaccess.conf 1148 doins scripts/mysqlaccess.conf
1149 mycnf_src="my.cnf-${mysql_mycnf_version}"
938 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1150 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
939 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 1151 -e "s!/tmp!${EPREFIX}/tmp!" \
1152 -e "s!/usr!${EPREFIX}/usr!" \
1153 -e "s!= /var!= ${EPREFIX}/var!" \
1154 "${FILESDIR}/${mycnf_src}" \
940 > "${TMPDIR}/my.cnf.ok" 1155 > "${TMPDIR}/my.cnf.ok"
941 if mysql_version_is_at_least "4.1" && use latin1 ; then 1156 use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
1157 if use latin1 ; then
942 sed -i \ 1158 sed -i \
943 -e "/character-set/s|utf8|latin1|g" \ 1159 -e "/character-set/s|utf8|latin1|g" \
944 "${TMPDIR}/my.cnf.ok" 1160 "${TMPDIR}/my.cnf.ok"
945 fi 1161 fi
946 newins "${TMPDIR}/my.cnf.ok" my.cnf 1162 newins "${TMPDIR}/my.cnf.ok" my.cnf
949 if ! use minimal ; then 1165 if ! use minimal ; then
950 einfo "Creating initial directories" 1166 einfo "Creating initial directories"
951 # Empty directories ... 1167 # Empty directories ...
952 diropts "-m0750" 1168 diropts "-m0750"
953 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 1169 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
954 dodir "${MY_DATADIR}" 1170 dodir "${MY_DATADIR#${EPREFIX}}"
955 keepdir "${MY_DATADIR}" 1171 keepdir "${MY_DATADIR#${EPREFIX}}"
956 chown -R mysql:mysql "${D}/${MY_DATADIR}" 1172 chown -R mysql:mysql "${D}/${MY_DATADIR}"
957 fi 1173 fi
958 1174
959 diropts "-m0755" 1175 diropts "-m0755"
960 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 1176 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
961 dodir "${folder}" 1177 dodir "${folder}"
962 keepdir "${folder}" 1178 keepdir "${folder}"
963 chown -R mysql:mysql "${D}/${folder}" 1179 chown -R mysql:mysql "${ED}/${folder}"
964 done 1180 done
965 fi 1181 fi
966 1182
967 # Docs 1183 # Docs
968 einfo "Installing docs" 1184 einfo "Installing docs"
969 dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 1185 for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
1186 [[ -f "$i" ]] && dodoc "$i"
1187 done
970 doinfo "${S}"/Docs/mysql.info 1188 doinfo "${S}"/Docs/mysql.info
971 1189
972 # Minimal builds don't have the MySQL server 1190 # Minimal builds don't have the MySQL server
973 if ! use minimal ; then 1191 if ! use minimal ; then
974 einfo "Including support files and sample configurations" 1192 einfo "Including support files and sample configurations"
986 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1204 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
987 done 1205 done
988 1206
989 fi 1207 fi
990 1208
991 mysql_lib_symlinks "${D}" 1209 mysql_lib_symlinks "${ED}"
992} 1210}
993 1211
994# @FUNCTION: mysql_pkg_preinst 1212# @FUNCTION: mysql_pkg_preinst
995# @DESCRIPTION: 1213# @DESCRIPTION:
996# Create the user and groups for mysql - die if that fails. 1214# Create the user and groups for mysql - die if that fails.
1010mysql_pkg_postinst() { 1228mysql_pkg_postinst() {
1011 # Make sure the vars are correctly initialized 1229 # Make sure the vars are correctly initialized
1012 mysql_init_vars 1230 mysql_init_vars
1013 1231
1014 # Check FEATURES="collision-protect" before removing this 1232 # Check FEATURES="collision-protect" before removing this
1015 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" 1233 [[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
1016 1234
1017 # Secure the logfiles 1235 # Secure the logfiles
1018 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 1236 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
1019 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 1237 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
1020 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 1238 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
1041 einfo 1259 einfo
1042 elog "You might want to run:" 1260 elog "You might want to run:"
1043 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1261 elog "\"emerge --config =${CATEGORY}/${PF}\""
1044 elog "if this is a new install." 1262 elog "if this is a new install."
1045 einfo 1263 einfo
1264
1265 einfo
1266 elog "If you are upgrading major versions, you should run the"
1267 elog "mysql_upgrade tool."
1268 einfo
1046 fi 1269 fi
1047 1270
1048 if pbxt_available && use pbxt ; then 1271 if pbxt_available && use pbxt ; then
1049 # TODO: explain it better 1272 elog "Note: PBXT is now statically built when enabled."
1050 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1273 elog ""
1051 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1274 elog "If, you previously installed as a plugin and "
1052 elog "if, after that, you cannot start the MySQL server," 1275 elog "you cannot start the MySQL server,"
1053 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1276 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
1054 elog "use the MySQL upgrade script to restore the table" 1277 elog "use the MySQL upgrade script to restore the table"
1055 elog "or execute the following SQL command:" 1278 elog "or execute the following SQL command:"
1056 elog " CREATE TABLE IF NOT EXISTS plugin (" 1279 elog " CREATE TABLE IF NOT EXISTS plugin ("
1057 elog " name char(64) binary DEFAULT '' NOT NULL," 1280 elog " name char(64) binary DEFAULT '' NOT NULL,"
1063 mysql_check_version_range "4.0 to 5.0.99.99" \ 1286 mysql_check_version_range "4.0 to 5.0.99.99" \
1064 && use berkdb \ 1287 && use berkdb \
1065 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 1288 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
1066} 1289}
1067 1290
1291# @FUNCTION: mysql_getopt
1292# @DESCRIPTION:
1293# Use my_print_defaults to extract specific config options
1294mysql_getopt() {
1295 local mypd="${EROOT}"/usr/bin/my_print_defaults
1296 section="$1"
1297 flag="--${2}="
1298 "${mypd}" $section | sed -n "/^${flag}/p"
1299}
1300
1301# @FUNCTION: mysql_getoptval
1302# @DESCRIPTION:
1303# Use my_print_defaults to extract specific config options
1304mysql_getoptval() {
1305 local mypd="${EROOT}"/usr/bin/my_print_defaults
1306 section="$1"
1307 flag="--${2}="
1308 "${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
1309}
1310
1068# @FUNCTION: mysql_pkg_config 1311# @FUNCTION: mysql_pkg_config
1069# @DESCRIPTION: 1312# @DESCRIPTION:
1070# Configure mysql environment. 1313# Configure mysql environment.
1071mysql_pkg_config() { 1314mysql_pkg_config() {
1072 local old_MY_DATADIR="${MY_DATADIR}" 1315 local old_MY_DATADIR="${MY_DATADIR}"
1316 local old_HOME="${HOME}"
1317 # my_print_defaults needs to read stuff in $HOME/.my.cnf
1318 export HOME=/root
1073 1319
1074 # Make sure the vars are correctly initialized 1320 # Make sure the vars are correctly initialized
1075 mysql_init_vars 1321 mysql_init_vars
1076 1322
1077 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 1323 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
1079 if built_with_use ${CATEGORY}/${PN} minimal ; then 1325 if built_with_use ${CATEGORY}/${PN} minimal ; then
1080 die "Minimal builds do NOT include the MySQL server" 1326 die "Minimal builds do NOT include the MySQL server"
1081 fi 1327 fi
1082 1328
1083 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then 1329 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
1084 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})" 1330 local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
1331 MY_DATADIR_s="${MY_DATADIR_s%%/}"
1085 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})" 1332 local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
1333 old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
1086 1334
1087 if [[ -d "${old_MY_DATADIR_s}" ]]; then 1335 if [[ -d "${old_MY_DATADIR_s}" ]] && [[ "${old_MY_DATADIR_s}" != / ]]; then
1088 if [[ -d "${MY_DATADIR_s}" ]]; then 1336 if [[ -d "${MY_DATADIR_s}" ]]; then
1089 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" 1337 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
1090 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" 1338 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
1091 else 1339 else
1092 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" 1340 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
1104 fi 1352 fi
1105 fi 1353 fi
1106 1354
1107 local pwd1="a" 1355 local pwd1="a"
1108 local pwd2="b" 1356 local pwd2="b"
1109 local MYSQL_ROOT_PASSWORD=''
1110 local maxtry=15 1357 local maxtry=15
1111 1358
1112 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then 1359 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1113 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")" 1360 MYSQL_ROOT_PASSWORD="$(mysql_getoptval 'client mysql' password)"
1361 fi
1362 MYSQL_TMPDIR="$(mysql_getoptval mysqld tmpdir)"
1363 # These are dir+prefix
1364 MYSQL_RELAY_LOG="$(mysql_getoptval mysqld relay-log)"
1365 MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
1366 MYSQL_LOG_BIN="$(mysql_getoptval mysqld log-bin)"
1367 MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
1368
1369 if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
1370 einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
1371 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
1372 fi
1373 if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
1374 einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
1375 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
1376 fi
1377 if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
1378 einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
1379 install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
1114 fi 1380 fi
1115 1381
1116 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1382 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1117 ewarn "You have already a MySQL database in place." 1383 ewarn "You have already a MySQL database in place."
1118 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1384 ewarn "(${ROOT}/${MY_DATADIR}/*)"
1124 # localhost. Also causes weird failures. 1390 # localhost. Also causes weird failures.
1125 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1391 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1126 1392
1127 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then 1393 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1128 1394
1129 einfo "Please provide a password for the mysql 'root' user now," 1395 einfo "Please provide a password for the mysql 'root' user now, in the"
1130 einfo "or in the MYSQL_ROOT_PASSWORD env var." 1396 einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
1131 ewarn "Avoid [\"'\\_%] characters in the password" 1397 ewarn "Avoid [\"'\\_%] characters in the password"
1132 read -rsp " >" pwd1 ; echo 1398 read -rsp " >" pwd1 ; echo
1133 1399
1134 einfo "Retype the password" 1400 einfo "Retype the password"
1135 read -rsp " >" pwd2 ; echo 1401 read -rsp " >" pwd2 ; echo
1139 fi 1405 fi
1140 MYSQL_ROOT_PASSWORD="${pwd1}" 1406 MYSQL_ROOT_PASSWORD="${pwd1}"
1141 unset pwd1 pwd2 1407 unset pwd1 pwd2
1142 fi 1408 fi
1143 1409
1144 local options="" 1410 local options="--log-warnings=0"
1145 local sqltmp="$(emktemp)" 1411 local sqltmp="$(emktemp)"
1146 1412
1147 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" 1413 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
1148 [[ -r "${help_tables}" ]] \ 1414 [[ -r "${help_tables}" ]] \
1149 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 1415 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
1150 || touch "${TMPDIR}/fill_help_tables.sql" 1416 || touch "${TMPDIR}/fill_help_tables.sql"
1151 help_tables="${TMPDIR}/fill_help_tables.sql" 1417 help_tables="${TMPDIR}/fill_help_tables.sql"
1152 1418
1419 # Figure out which options we need to disable to do the setup
1420 helpfile="${TMPDIR}/mysqld-help"
1421 ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1422 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1423 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1424 ndbcluster log-slave-updates \
1425 ; do
1426 optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
1427 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1428 done
1429 # But some options changed names
1430 egrep -sq external-locking "${helpfile}" && \
1431 options="${options/skip-locking/skip-external-locking}"
1432
1433 use prefix || options="${options} --user=mysql"
1434
1153 pushd "${TMPDIR}" &>/dev/null 1435 pushd "${TMPDIR}" &>/dev/null
1154 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1 1436 #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
1437 cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
1438 [ -f ${cmd} ] || cmd=${EROOT}usr/bin/mysql_install_db
1439 cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
1440 einfo "Command: $cmd"
1441 eval $cmd \
1442 >"${TMPDIR}"/mysql_install_db.log 2>&1
1155 if [ $? -ne 0 ]; then 1443 if [ $? -ne 0 ]; then
1156 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 1444 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
1157 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" 1445 die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
1158 fi 1446 fi
1159 popd &>/dev/null 1447 popd &>/dev/null
1160 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1448 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1161 || die "MySQL databases not installed" 1449 || die "MySQL databases not installed"
1162 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1450 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1163 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1451 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1164 1452
1165 # Figure out which options we need to disable to do the setup
1166 helpfile="${TMPDIR}/mysqld-help"
1167 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1168 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1169 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1170 ; do
1171 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1172 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1173 done
1174 # But some options changed names
1175 egrep -sq external-locking "${helpfile}" && \
1176 options="${options/skip-locking/skip-external-locking}"
1177
1178 if mysql_version_is_at_least "4.1.3" ; then 1453 if mysql_version_is_at_least "4.1.3" ; then
1179 # Filling timezones, see 1454 # Filling timezones, see
1180 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1455 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1181 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1456 "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
1182 1457
1183 if [[ -r "${help_tables}" ]] ; then 1458 if [[ -r "${help_tables}" ]] ; then
1184 cat "${help_tables}" >> "${sqltmp}" 1459 cat "${help_tables}" >> "${sqltmp}"
1185 fi 1460 fi
1186 fi 1461 fi
1187 1462
1188 einfo "Creating the mysql database and setting proper" 1463 einfo "Creating the mysql database and setting proper"
1189 einfo "permissions on it ..." 1464 einfo "permissions on it ..."
1190 1465
1191 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1466 local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1192 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1467 local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1193 local mysqld="${ROOT}/usr/sbin/mysqld \ 1468 local mysqld="${EROOT}/usr/sbin/mysqld \
1194 ${options} \ 1469 ${options} \
1195 --user=mysql \ 1470 --user=mysql \
1471 --log-warnings=0 \
1196 --basedir=${ROOT}/usr \ 1472 --basedir=${EROOT}/usr \
1197 --datadir=${ROOT}/${MY_DATADIR} \ 1473 --datadir=${ROOT}/${MY_DATADIR} \
1198 --max_allowed_packet=8M \ 1474 --max_allowed_packet=8M \
1199 --net_buffer_length=16K \ 1475 --net_buffer_length=16K \
1476 --default-storage-engine=MyISAM \
1200 --socket=${socket} \ 1477 --socket=${socket} \
1201 --pid-file=${pidfile}" 1478 --pid-file=${pidfile}"
1202 #einfo "About to start mysqld: ${mysqld}" 1479 #einfo "About to start mysqld: ${mysqld}"
1203 ebegin "Starting mysqld" 1480 ebegin "Starting mysqld"
1481 einfo "Command ${mysqld}"
1204 ${mysqld} & 1482 ${mysqld} &
1205 rc=$? 1483 rc=$?
1206 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1484 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1207 maxtry=$((${maxtry}-1)) 1485 maxtry=$((${maxtry}-1))
1208 echo -n "." 1486 echo -n "."
1215 fi 1493 fi
1216 1494
1217 ebegin "Setting root password" 1495 ebegin "Setting root password"
1218 # Do this from memory, as we don't want clear text passwords in temp files 1496 # Do this from memory, as we don't want clear text passwords in temp files
1219 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" 1497 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1220 "${ROOT}/usr/bin/mysql" \ 1498 "${EROOT}/usr/bin/mysql" \
1221 --socket=${socket} \ 1499 --socket=${socket} \
1222 -hlocalhost \ 1500 -hlocalhost \
1223 -e "${sql}" 1501 -e "${sql}"
1224 eend $? 1502 eend $?
1225 1503
1226 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..." 1504 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1227 "${ROOT}/usr/bin/mysql" \ 1505 "${EROOT}/usr/bin/mysql" \
1228 --socket=${socket} \ 1506 --socket=${socket} \
1229 -hlocalhost \ 1507 -hlocalhost \
1230 -uroot \ 1508 -uroot \
1231 -p"${MYSQL_ROOT_PASSWORD}" \ 1509 --password="${MYSQL_ROOT_PASSWORD}" \
1232 mysql < "${sqltmp}" 1510 mysql < "${sqltmp}"
1233 rc=$? 1511 rc=$?
1234 eend $? 1512 eend $?
1235 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!" 1513 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1236 1514
1244 1522
1245# @FUNCTION: mysql_pkg_postrm 1523# @FUNCTION: mysql_pkg_postrm
1246# @DESCRIPTION: 1524# @DESCRIPTION:
1247# Remove mysql symlinks. 1525# Remove mysql symlinks.
1248mysql_pkg_postrm() { 1526mysql_pkg_postrm() {
1249 : # mysql_lib_symlinks "${D}" 1527 : # mysql_lib_symlinks "${ED}"
1250} 1528}

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

  ViewVC Help
Powered by ViewVC 1.1.20