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

Diff of /eclass/mysql.eclass

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

Revision 1.138 Revision 1.179
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2014 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.138 2010/03/15 19:05:51 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.179 2014/07/19 10:18:41 grobian 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 user
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}
… …
389 456
390configure_common() { 457configure_common() {
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 use prefix || 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
631 # This base set are required, and will always be statically built.
538 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
539 if use extraengine ; then 644 if use extraengine ; then
540 # 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
541 # not added yet: ibmdb2i 646 # not added yet: ibmdb2i
542 # Not supporting as examples: example,daemon_example,ftexample 647 # Not supporting as examples: example,daemon_example,ftexample
543 plugins="${plugins},archive,blackhole,federated,partition" 648 plugins_sta="${plugins_sta} partition"
544 649
545 if [[ "${PN}" != "mariadb" ]] ; then 650 if [[ "${PN}" != "mariadb" ]] ; then
546 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"
547 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"
548 else 654 else
549 elog "MariaDB includes the FederatedX engine. Be sure to read" 655 elog "MariaDB includes the FederatedX engine. Be sure to read"
550 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"
551 fi 658 fi
659 else
660 plugins_dis="${plugins_dis} partition federated"
552 fi 661 fi
553 662
554 # Upstream specifically requests that InnoDB always be built: 663 # Upstream specifically requests that InnoDB always be built:
555 # - innobase, innodb_plugin 664 # - innobase, innodb_plugin
556 # Build falcon if available for 6.x series. 665 # Build falcon if available for 6.x series.
557 for i in innobase innodb_plugin falcon ; do 666 for i in innobase falcon ; do
558 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}" 667 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
559 done 668 done
669 for i in innodb_plugin ; do
670 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
671 done
560 672
561 # like configuration=max-no-ndb 673 # like configuration=max-no-ndb
562 if use cluster ; then 674 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
563 plugins="${plugins},ndbcluster" 675 plugins_sta="${plugins_sta} ndbcluster partition"
676 plugins_dis="${plugins_dis//partition}"
564 myconf="${myconf} --with-ndb-binlog" 677 myconf="${myconf} --with-ndb-binlog"
678 else
679 plugins_dis="${plugins_dis} ndbcluster"
565 fi 680 fi
566 681
567 if [[ "${PN}" == "mariadb" ]] ; then 682 if [[ "${PN}" == "mariadb" ]] ; then
568 # 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
569 # caught above. 684 # caught above.
570 plugins="${plugins},maria,innobase"
571 if use pbxt ; then
572 plugins="${plugins},pbxt"
573 else
574 myconf="${myconf} --without-plugin-pbxt"
575 fi
576 myconf="${myconf} $(use_with libevent)"
577 # This is not optional, without it several upstream testcases fail. 685 # This is not optional, without it several upstream testcases fail.
578 # Also strongly recommended by upstream. 686 # Also strongly recommended by upstream.
687 if [[ "${PV}" < "5.2.0" ]] ; then
579 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"
580 fi 693 fi
581 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
582 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
583} 736}
584 737
585pbxt_src_configure() { 738pbxt_src_configure() {
586 mysql_init_vars 739 mysql_init_vars
587 740
588 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 741 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
589 742
590 einfo "Reconfiguring dir '${PWD}'" 743 einfo "Reconfiguring dir '${PWD}'"
591 AT_GNUCONF_UPDATE="yes" eautoreconf 744 eautoreconf
592 745
593 local myconf="" 746 local myconf=""
594 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 747 myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
595 use debug && myconf="${myconf} --with-debug=full" 748 use debug && myconf="${myconf} --with-debug=full"
596 econf ${myconf} || die "Problem configuring PBXT storage engine" 749 econf ${myconf} || die "Problem configuring PBXT storage engine"
597} 750}
598 751
599pbxt_src_compile() { 752pbxt_src_compile() {
753
600 # Be backwards compatible for now 754 # Be backwards compatible for now
601 if [[ $EAPI != 2 ]]; then 755 if [[ $EAPI != 2 ]]; then
602 pbxt_src_configure 756 pbxt_src_configure
603 fi 757 fi
604 # TODO: is it safe/needed to use emake here ? 758 # TODO: is it safe/needed to use emake here ?
… …
623# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" 777# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
624# check for conflicting use flags 778# check for conflicting use flags
625# create new user and group for mysql 779# create new user and group for mysql
626# warn about deprecated features 780# warn about deprecated features
627mysql_pkg_setup() { 781mysql_pkg_setup() {
628 if hasq test ${FEATURES} ; then 782 if has test ${FEATURES} ; then
629 if ! use minimal ; then 783 if ! use minimal ; then
630 if [[ $UID -eq 0 ]]; then 784 if [[ $UID -eq 0 ]]; then
631 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."
632 fi 786 fi
633 fi 787 fi
634 fi 788 fi
635 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
636 # Check for USE flag problems in pkg_setup 799 # Check for USE flag problems in pkg_setup
637 if use static && use ssl ; then 800 if use static && use ssl ; then
638 eerror "MySQL does not support being built statically with SSL support enabled!"
639 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"
640 fi 811 fi
641 812
642 if ! mysql_version_is_at_least "5.0" \ 813 if ! mysql_version_is_at_least "5.0" \
643 && use raid \ 814 && use raid \
644 && use static ; then 815 && use static ; then
… …
646 eerror "with RAID support enabled." 817 eerror "with RAID support enabled."
647 die "USE flags 'raid' and 'static' conflict!" 818 die "USE flags 'raid' and 'static' conflict!"
648 fi 819 fi
649 820
650 if mysql_version_is_at_least "4.1.3" \ 821 if mysql_version_is_at_least "4.1.3" \
651 && ( use cluster || use extraengine ) \ 822 && ( use cluster || use extraengine || use embedded ) \
652 && use minimal ; then 823 && use minimal ; then
653 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
654 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}"
655 fi 827 fi
656 828
657 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
658 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
659 GCC_VER=$(gcc-version) 842 GCC_VER=$(gcc-version)
660 case ${GCC_VER} in 843 case ${CHOST}:${GCC_VER} in
661 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!" ;;
662 esac 850 esac
663 fi 851 fi
664 852
665 # This should come after all of the die statements 853 # This should come after all of the die statements
666 enewgroup mysql 60 || die "problem adding 'mysql' group" 854 enewgroup mysql 60 || die "problem adding 'mysql' group"
… …
716 mysql_mv_patches 904 mysql_mv_patches
717 # And apply 905 # And apply
718 epatch 906 epatch
719 907
720 # last -fPIC fixup, per bug #305873 908 # last -fPIC fixup, per bug #305873
721 i="${S}"/storage/innodb_plugin/plug.in 909 i="${S}"/storage/innodb_plugin/plug.in
722 [ -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}"
723 911
724 # 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
725 rm -f "${S}/zlib/"*.[ch] 915 rm -f "${S}/zlib/"*.[ch]
726 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
727 rm -f "scripts/mysqlbug" 918 rm -f "scripts/mysqlbug"
728 919
729 # Make charsets install in the right place 920 # Make charsets install in the right place
730 find . -name 'Makefile.am' \ 921 find . -name 'Makefile.am' \
731 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 922 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
… …
742 fi 933 fi
743 934
744 local rebuilddirlist d 935 local rebuilddirlist d
745 936
746 if xtradb_patch_available && use xtradb ; then 937 if xtradb_patch_available && use xtradb ; then
747 einfo "Replacing InnoDB with Percona XtraDB" 938 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
748 pushd "${S}"/storage 939 pushd "${S}"/storage >/dev/null
749 i="innobase" 940 i="innobase"
750 o="${WORKDIR}/storage-${i}.mysql-upstream" 941 o="${WORKDIR}/storage-${i}.mysql-upstream"
751 # Have we been here already? 942 # Have we been here already?
752 [ -d "${o}" ] && rm -f "${i}" 943 [ -d "${o}" ] && rm -f "${i}"
753 # Or maybe we haven't 944 # Or maybe we haven't
754 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 945 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
755 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}" 946 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
756 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
757 fi 957 fi
758 958
759 if mysql_version_is_at_least "5.1.12" ; then 959 if mysql_version_is_at_least "5.1.12" ; then
760 rebuilddirlist="." 960 rebuilddirlist="."
761 # 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
… …
770 fi 970 fi
771 971
772 for d in ${rebuilddirlist} ; do 972 for d in ${rebuilddirlist} ; do
773 einfo "Reconfiguring dir '${d}'" 973 einfo "Reconfiguring dir '${d}'"
774 pushd "${d}" &>/dev/null 974 pushd "${d}" &>/dev/null
775 AT_GNUCONF_UPDATE="yes" eautoreconf 975 eautoreconf
776 popd &>/dev/null 976 popd &>/dev/null
777 done 977 done
778 978
779 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" \
780 && use berkdb ; then 980 && use berkdb ; then
781 einfo "Fixing up berkdb buildsystem" 981 einfo "Fixing up berkdb buildsystem"
782 [[ -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"
783 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" \
784 || die "Could not copy libtool.m4 to bdb/dist/" 984 || die "Could not copy libtool.m4 to bdb/dist/"
785 #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.
786 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 986 if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
787 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" 987 cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
788 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" 988 cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
789 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"
790 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" 990 cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
791 fi 991 fi
792 pushd "bdb/dist" &>/dev/null 992 pushd "bdb/dist" &>/dev/null
793 sh s_all \ 993 sh s_all \
794 || die "Failed bdb reconfigure" 994 || die "Failed bdb reconfigure"
795 popd &>/dev/null 995 popd &>/dev/null
… …
819 1019
820 # Bug #114895, bug #110149 1020 # Bug #114895, bug #110149
821 filter-flags "-O" "-O[01]" 1021 filter-flags "-O" "-O[01]"
822 1022
823 # glib-2.3.2_pre fix, bug #16496 1023 # glib-2.3.2_pre fix, bug #16496
824 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 1024 append-cppflags "-DHAVE_ERRNO_AS_DEFINE=1"
825 1025
826 # As discovered by bug #246652, doing a double-level of SSP causes NDB to 1026 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
827 # fail badly during cluster startup. 1027 # fail badly during cluster startup.
828 if [[ $(gcc-major-version) -lt 4 ]]; then 1028 if [[ $(gcc-major-version) -lt 4 ]]; then
829 filter-flags "-fstack-protector-all" 1029 filter-flags "-fstack-protector-all"
… …
836 export CXXFLAGS 1036 export CXXFLAGS
837 1037
838 # 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.
839 append-flags -fno-strict-aliasing 1039 append-flags -fno-strict-aliasing
840 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
841 econf \ 1050 econf \
842 --libexecdir="/usr/sbin" \ 1051 --libexecdir="${EPREFIX}"/usr/sbin \
843 --sysconfdir="${MY_SYSCONFDIR}" \ 1052 --sysconfdir=${MY_SYSCONFDIR} \
844 --localstatedir="${MY_LOCALSTATEDIR}" \ 1053 --localstatedir=${MY_LOCALSTATEDIR} \
845 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1054 --sharedstatedir=${MY_SHAREDSTATEDIR} \
846 --libdir="${MY_LIBDIR}" \ 1055 --libdir=${MY_LIBDIR} \
847 --includedir="${MY_INCLUDEDIR}" \ 1056 --includedir=${MY_INCLUDEDIR} \
848 --with-low-memory \ 1057 --with-low-memory \
849 --with-client-ldflags=-lstdc++ \ 1058 --with-client-ldflags=-lstdc++ \
850 --enable-thread-safe-client \ 1059 --enable-thread-safe-client \
851 --with-comment="Gentoo Linux ${PF}" \ 1060 --with-comment="Gentoo Linux ${PF}" \
852 --without-docs \ 1061 --without-docs \
1062 --with-LIBDIR="$(get_libdir)" \
853 ${myconf} || die "econf failed" 1063 ${myconf} || die "econf failed"
854 1064
855 # TODO: Move this before autoreconf !!! 1065 # TODO: Move this before autoreconf !!!
856 find . -type f -name Makefile -print0 \ 1066 find . -type f -name Makefile -print0 \
857 | xargs -0 -n100 sed -i \ 1067 | xargs -0 -n100 sed -i \
858 -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)|'
859 1069
860 if [[ $EAPI == 2 ]]; then 1070 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
861 pbxt_patch_available && use pbxt && pbxt_src_configure 1071 pbxt_patch_available && use pbxt && pbxt_src_configure
862 fi 1072 fi
863} 1073}
864 1074
865# @FUNCTION: mysql_src_compile 1075# @FUNCTION: mysql_src_compile
… …
872 0 | 1) mysql_src_configure ;; 1082 0 | 1) mysql_src_configure ;;
873 esac 1083 esac
874 1084
875 emake || die "emake failed" 1085 emake || die "emake failed"
876 1086
1087 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
877 pbxt_patch_available && use pbxt && pbxt_src_compile 1088 pbxt_patch_available && use pbxt && pbxt_src_compile
1089 fi
878} 1090}
879 1091
880# @FUNCTION: mysql_src_install 1092# @FUNCTION: mysql_src_install
881# @DESCRIPTION: 1093# @DESCRIPTION:
882# Install mysql. 1094# Install mysql.
… …
884 # Make sure the vars are correctly initialized 1096 # Make sure the vars are correctly initialized
885 mysql_init_vars 1097 mysql_init_vars
886 1098
887 emake install \ 1099 emake install \
888 DESTDIR="${D}" \ 1100 DESTDIR="${D}" \
889 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1101 benchdir_root=${MY_SHAREDSTATEDIR} \
890 testroot="${MY_SHAREDSTATEDIR}" \ 1102 testroot="${MY_SHAREDSTATEDIR}" \
891 || die "emake install failed" 1103 || die "emake install failed"
892 1104
1105 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
893 pbxt_patch_available && use pbxt && pbxt_src_install 1106 pbxt_patch_available && use pbxt && pbxt_src_install
1107 fi
894 1108
895 # Convenience links 1109 # Convenience links
896 einfo "Making Convenience links for mysqlcheck multi-call binary" 1110 einfo "Making Convenience links for mysqlcheck multi-call binary"
897 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1111 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
898 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1112 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
899 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 1113 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
900 1114
901 # Various junk (my-*.cnf moved elsewhere) 1115 # Various junk (my-*.cnf moved elsewhere)
902 einfo "Removing duplicate /usr/share/mysql files" 1116 einfo "Removing duplicate /usr/share/mysql files"
903 rm -Rf "${D}/usr/share/info" 1117 rm -Rf "${ED}/usr/share/info"
904 for removeme in "mysql-log-rotate" mysql.server* \ 1118 for removeme in "mysql-log-rotate" mysql.server* \
905 binary-configure* my-*.cnf mi_test_all* 1119 binary-configure* my-*.cnf mi_test_all*
906 do 1120 do
907 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} 1121 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
908 done 1122 done
909 1123
910 # Clean up stuff for a minimal build 1124 # Clean up stuff for a minimal build
911 if use minimal ; then 1125 if use minimal ; then
912 einfo "Remove all extra content for minimal build" 1126 einfo "Remove all extra content for minimal build"
913 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 1127 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
914 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}
915 rm -f "${D}/usr/sbin/mysqld" 1129 rm -f "${ED}/usr/sbin/mysqld"
916 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
917 fi 1131 fi
918 1132
919 # Unless they explicitly specific USE=test, then do not install the 1133 # Unless they explicitly specific USE=test, then do not install the
920 # 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
… …
922 if use !test ; then 1136 if use !test ; then
923 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test 1137 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
924 fi 1138 fi
925 1139
926 # Configuration stuff 1140 # Configuration stuff
927 if mysql_version_is_at_least "4.1" ; then 1141 case ${MYSQL_PV_MAJOR} in
928 mysql_mycnf_version="4.1"
929 else
930 mysql_mycnf_version="4.0" 1142 3*|4.0) mysql_mycnf_version="4.0" ;;
931 fi 1143 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
932 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})"
933 insinto "${MY_SYSCONFDIR}" 1147 insinto "${MY_SYSCONFDIR#${EPREFIX}}"
934 doins scripts/mysqlaccess.conf 1148 doins scripts/mysqlaccess.conf
1149 mycnf_src="my.cnf-${mysql_mycnf_version}"
935 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1150 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
936 "${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}" \
937 > "${TMPDIR}/my.cnf.ok" 1155 > "${TMPDIR}/my.cnf.ok"
938 if mysql_version_is_at_least "4.1" && use latin1 ; then 1156 use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
939 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 1157 if use latin1 ; then
1158 sed -i \
1159 -e "/character-set/s|utf8|latin1|g" \
1160 "${TMPDIR}/my.cnf.ok"
940 fi 1161 fi
941 newins "${TMPDIR}/my.cnf.ok" my.cnf 1162 newins "${TMPDIR}/my.cnf.ok" my.cnf
942 1163
943 # Minimal builds don't have the MySQL server 1164 # Minimal builds don't have the MySQL server
944 if ! use minimal ; then 1165 if ! use minimal ; then
945 einfo "Creating initial directories" 1166 einfo "Creating initial directories"
946 # Empty directories ... 1167 # Empty directories ...
947 diropts "-m0750" 1168 diropts "-m0750"
948 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 1169 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
949 dodir "${MY_DATADIR}" 1170 dodir "${MY_DATADIR#${EPREFIX}}"
950 keepdir "${MY_DATADIR}" 1171 keepdir "${MY_DATADIR#${EPREFIX}}"
951 chown -R mysql:mysql "${D}/${MY_DATADIR}" 1172 chown -R mysql:mysql "${D}/${MY_DATADIR}"
952 fi 1173 fi
953 1174
954 diropts "-m0755" 1175 diropts "-m0755"
955 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 1176 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
956 dodir "${folder}" 1177 dodir "${folder}"
957 keepdir "${folder}" 1178 keepdir "${folder}"
958 chown -R mysql:mysql "${D}/${folder}" 1179 chown -R mysql:mysql "${ED}/${folder}"
959 done 1180 done
960 fi 1181 fi
961 1182
962 # Docs 1183 # Docs
963 einfo "Installing docs" 1184 einfo "Installing docs"
964 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
965 doinfo "${S}"/Docs/mysql.info 1188 doinfo "${S}"/Docs/mysql.info
966 1189
967 # Minimal builds don't have the MySQL server 1190 # Minimal builds don't have the MySQL server
968 if ! use minimal ; then 1191 if ! use minimal ; then
969 einfo "Including support files and sample configurations" 1192 einfo "Including support files and sample configurations"
… …
981 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1204 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
982 done 1205 done
983 1206
984 fi 1207 fi
985 1208
986 mysql_lib_symlinks "${D}" 1209 mysql_lib_symlinks "${ED}"
987} 1210}
988 1211
989# @FUNCTION: mysql_pkg_preinst 1212# @FUNCTION: mysql_pkg_preinst
990# @DESCRIPTION: 1213# @DESCRIPTION:
991# Create the user and groups for mysql - die if that fails. 1214# Create the user and groups for mysql - die if that fails.
… …
1005mysql_pkg_postinst() { 1228mysql_pkg_postinst() {
1006 # Make sure the vars are correctly initialized 1229 # Make sure the vars are correctly initialized
1007 mysql_init_vars 1230 mysql_init_vars
1008 1231
1009 # Check FEATURES="collision-protect" before removing this 1232 # Check FEATURES="collision-protect" before removing this
1010 [[ -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}"
1011 1234
1012 # Secure the logfiles 1235 # Secure the logfiles
1013 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 1236 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
1014 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 1237 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
1015 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 1238 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
… …
1036 einfo 1259 einfo
1037 elog "You might want to run:" 1260 elog "You might want to run:"
1038 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1261 elog "\"emerge --config =${CATEGORY}/${PF}\""
1039 elog "if this is a new install." 1262 elog "if this is a new install."
1040 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
1041 fi 1269 fi
1042 1270
1043 if pbxt_available && use pbxt ; then 1271 if pbxt_available && use pbxt ; then
1044 # TODO: explain it better 1272 elog "Note: PBXT is now statically built when enabled."
1045 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 1273 elog ""
1046 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 1274 elog "If, you previously installed as a plugin and "
1047 elog "if, after that, you cannot start the MySQL server," 1275 elog "you cannot start the MySQL server,"
1048 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 1276 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
1049 elog "use the MySQL upgrade script to restore the table" 1277 elog "use the MySQL upgrade script to restore the table"
1050 elog "or execute the following SQL command:" 1278 elog "or execute the following SQL command:"
1051 elog " CREATE TABLE IF NOT EXISTS plugin (" 1279 elog " CREATE TABLE IF NOT EXISTS plugin ("
1052 elog " name char(64) binary DEFAULT '' NOT NULL," 1280 elog " name char(64) binary DEFAULT '' NOT NULL,"
… …
1058 mysql_check_version_range "4.0 to 5.0.99.99" \ 1286 mysql_check_version_range "4.0 to 5.0.99.99" \
1059 && use berkdb \ 1287 && use berkdb \
1060 && 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!"
1061} 1289}
1062 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
1063# @FUNCTION: mysql_pkg_config 1311# @FUNCTION: mysql_pkg_config
1064# @DESCRIPTION: 1312# @DESCRIPTION:
1065# Configure mysql environment. 1313# Configure mysql environment.
1066mysql_pkg_config() { 1314mysql_pkg_config() {
1067 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
1068 1319
1069 # Make sure the vars are correctly initialized 1320 # Make sure the vars are correctly initialized
1070 mysql_init_vars 1321 mysql_init_vars
1071 1322
1072 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" 1323 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
… …
1074 if built_with_use ${CATEGORY}/${PN} minimal ; then 1325 if built_with_use ${CATEGORY}/${PN} minimal ; then
1075 die "Minimal builds do NOT include the MySQL server" 1326 die "Minimal builds do NOT include the MySQL server"
1076 fi 1327 fi
1077 1328
1078 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then 1329 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
1079 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%%/}"
1080 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%%/}"
1081 1334
1082 if [[ -d "${old_MY_DATADIR_s}" ]]; then 1335 if [[ -d "${old_MY_DATADIR_s}" ]] && [[ "${old_MY_DATADIR_s}" != / ]]; then
1083 if [[ -d "${MY_DATADIR_s}" ]]; then 1336 if [[ -d "${MY_DATADIR_s}" ]]; then
1084 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" 1337 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
1085 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}"
1086 else 1339 else
1087 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}"
… …
1099 fi 1352 fi
1100 fi 1353 fi
1101 1354
1102 local pwd1="a" 1355 local pwd1="a"
1103 local pwd2="b" 1356 local pwd2="b"
1104 local maxtry=5 1357 local maxtry=15
1358
1359 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
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 "${ROOT}"/$MYSQL_TMPDIR ]]; then
1370 einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
1371 install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_TMPDIR
1372 fi
1373 if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then
1374 einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
1375 install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_LOG_BIN
1376 fi
1377 if [[ ! -d "${ROOT}"/$MYSQL_RELAY_LOG ]]; then
1378 einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
1379 install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_RELAY_LOG
1380 fi
1105 1381
1106 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1382 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1107 ewarn "You have already a MySQL database in place." 1383 ewarn "You have already a MySQL database in place."
1108 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1384 ewarn "(${ROOT}/${MY_DATADIR}/*)"
1109 ewarn "Please rename or delete it if you wish to replace it." 1385 ewarn "Please rename or delete it if you wish to replace it."
… …
1112 1388
1113 # Bug #213475 - MySQL _will_ object strenously if your machine is named 1389 # Bug #213475 - MySQL _will_ object strenously if your machine is named
1114 # localhost. Also causes weird failures. 1390 # localhost. Also causes weird failures.
1115 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1391 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1116 1392
1117 einfo "Creating the mysql database and setting proper" 1393 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1118 einfo "permissions on it ..."
1119 1394
1120 einfo "Insert a password for the mysql 'root' user" 1395 einfo "Please provide a password for the mysql 'root' user now, in the"
1396 einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
1121 ewarn "Avoid [\"'\\_%] characters in the password" 1397 ewarn "Avoid [\"'\\_%] characters in the password"
1122 read -rsp " >" pwd1 ; echo 1398 read -rsp " >" pwd1 ; echo
1123 1399
1124 einfo "Retype the password" 1400 einfo "Retype the password"
1125 read -rsp " >" pwd2 ; echo 1401 read -rsp " >" pwd2 ; echo
1126 1402
1127 if [[ "x$pwd1" != "x$pwd2" ]] ; then 1403 if [[ "x$pwd1" != "x$pwd2" ]] ; then
1128 die "Passwords are not the same" 1404 die "Passwords are not the same"
1129 fi 1405 fi
1406 MYSQL_ROOT_PASSWORD="${pwd1}"
1407 unset pwd1 pwd2
1408 fi
1130 1409
1131 local options="" 1410 local options="--log-warnings=0"
1132 local sqltmp="$(emktemp)" 1411 local sqltmp="$(emktemp)"
1133 1412
1134 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" 1413 local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
1135 [[ -r "${help_tables}" ]] \ 1414 [[ -r "${help_tables}" ]] \
1136 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 1415 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
1137 || touch "${TMPDIR}/fill_help_tables.sql" 1416 || touch "${TMPDIR}/fill_help_tables.sql"
1138 help_tables="${TMPDIR}/fill_help_tables.sql" 1417 help_tables="${TMPDIR}/fill_help_tables.sql"
1139 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
1140 pushd "${TMPDIR}" &>/dev/null 1435 pushd "${TMPDIR}" &>/dev/null
1141 "${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
1142 if [ $? -ne 0 ]; then 1443 if [ $? -ne 0 ]; then
1143 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
1144 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"
1145 fi 1446 fi
1146 popd &>/dev/null 1447 popd &>/dev/null
1147 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ 1448 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
1148 || die "MySQL databases not installed" 1449 || die "MySQL databases not installed"
1149 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1450 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1150 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1451 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1151 1452
1152 if mysql_version_is_at_least "4.1.3" ; then 1453 if mysql_version_is_at_least "4.1.3" ; then
1153 options="--skip-ndbcluster"
1154
1155 # Filling timezones, see 1454 # Filling timezones, see
1156 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1455 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1157 "${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
1158 1457
1159 if [[ -r "${help_tables}" ]] ; then 1458 if [[ -r "${help_tables}" ]] ; then
1160 cat "${help_tables}" >> "${sqltmp}" 1459 cat "${help_tables}" >> "${sqltmp}"
1161 fi 1460 fi
1162 fi 1461 fi
1163 1462
1463 einfo "Creating the mysql database and setting proper"
1464 einfo "permissions on it ..."
1465
1164 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1466 local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1165 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1467 local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1166 local mysqld="${ROOT}/usr/sbin/mysqld \ 1468 local mysqld="${EROOT}/usr/sbin/mysqld \
1167 ${options} \ 1469 ${options} \
1168 --user=mysql \ 1470 $(use prefix || echo --user=mysql) \
1169 --skip-grant-tables \ 1471 --log-warnings=0 \
1170 --basedir=${ROOT}/usr \ 1472 --basedir=${EROOT}/usr \
1171 --datadir=${ROOT}/${MY_DATADIR} \ 1473 --datadir=${ROOT}/${MY_DATADIR} \
1172 --skip-innodb \
1173 --skip-bdb \
1174 --skip-networking \
1175 --max_allowed_packet=8M \ 1474 --max_allowed_packet=8M \
1176 --net_buffer_length=16K \ 1475 --net_buffer_length=16K \
1476 --default-storage-engine=MyISAM \
1177 --socket=${socket} \ 1477 --socket=${socket} \
1178 --pid-file=${pidfile}" 1478 --pid-file=${pidfile}"
1479 #einfo "About to start mysqld: ${mysqld}"
1480 ebegin "Starting mysqld"
1481 einfo "Command ${mysqld}"
1179 ${mysqld} & 1482 ${mysqld} &
1483 rc=$?
1180 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do 1484 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
1181 maxtry=$((${maxtry}-1)) 1485 maxtry=$((${maxtry}-1))
1182 echo -n "." 1486 echo -n "."
1183 sleep 1 1487 sleep 1
1184 done 1488 done
1489 eend $rc
1185 1490
1491 if ! [[ -S "${socket}" ]]; then
1492 die "Completely failed to start up mysqld with: ${mysqld}"
1493 fi
1494
1495 ebegin "Setting root password"
1186 # 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
1187 local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" 1497 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1188 "${ROOT}/usr/bin/mysql" \ 1498 "${EROOT}/usr/bin/mysql" \
1189 --socket=${socket} \ 1499 --socket=${socket} \
1190 -hlocalhost \ 1500 -hlocalhost \
1191 -e "${sql}" 1501 -e "${sql}"
1502 eend $?
1192 1503
1193 einfo "Loading \"zoneinfo\", this step may require a few seconds ..." 1504 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1194
1195 "${ROOT}/usr/bin/mysql" \ 1505 "${EROOT}/usr/bin/mysql" \
1196 --socket=${socket} \ 1506 --socket=${socket} \
1197 -hlocalhost \ 1507 -hlocalhost \
1198 -uroot \ 1508 -uroot \
1199 -p"${pwd1}" \ 1509 --password="${MYSQL_ROOT_PASSWORD}" \
1200 mysql < "${sqltmp}" 1510 mysql < "${sqltmp}"
1511 rc=$?
1512 eend $?
1513 [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
1201 1514
1202 # Stop the server and cleanup 1515 # Stop the server and cleanup
1516 einfo "Stopping the server ..."
1203 kill $(< "${pidfile}" ) 1517 kill $(< "${pidfile}" )
1204 rm -f "${sqltmp}" 1518 rm -f "${sqltmp}"
1205 einfo "Stopping the server ..."
1206 wait %1 1519 wait %1
1207 einfo "Done" 1520 einfo "Done"
1208} 1521}
1209 1522
1210# @FUNCTION: mysql_pkg_postrm 1523# @FUNCTION: mysql_pkg_postrm
1211# @DESCRIPTION: 1524# @DESCRIPTION:
1212# Remove mysql symlinks. 1525# Remove mysql symlinks.
1213mysql_pkg_postrm() { 1526mysql_pkg_postrm() {
1214 : # mysql_lib_symlinks "${D}" 1527 : # mysql_lib_symlinks "${ED}"
1215} 1528}
Legend:
Removed from v.1.138  
changed lines
  Added in v.1.179
  ViewVC Help
Powered by ViewVC 1.1.20