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

Diff of /eclass/mysql.eclass

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

Revision 1.142 Revision 1.170
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.142 2010/03/24 20:37:54 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.170 2012/01/09 10:42:19 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
… …
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
32fi 33fi
33 34
34case "${EAPI:-0}" in 35case "${EAPI:-0}" in
35 2) 36 2 | 3 | 4)
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] <=sys-libs/ncurses-5.7-r3 ) )"
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
… …
188IUSE="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"
189 233
190mysql_version_is_at_least "4.1" \ 234mysql_version_is_at_least "4.1" \
191&& IUSE="${IUSE} latin1" 235&& IUSE="${IUSE} latin1"
192 236
193mysql_version_is_at_least "4.1.3" \ 237if mysql_version_is_at_least "4.1.3" ; then
194&& IUSE="${IUSE} cluster extraengine" 238 IUSE="${IUSE} extraengine"
239 if [[ "${PN}" != "mysql-cluster" ]] ; then
240 IUSE="${IUSE} cluster"
241 fi
242fi
195 243
196mysql_version_is_at_least "5.0" \ 244mysql_version_is_at_least "5.0" \
197|| IUSE="${IUSE} raid" 245|| IUSE="${IUSE} raid"
198 246
199mysql_version_is_at_least "5.0.18" \ 247mysql_version_is_at_least "5.0.18" \
… …
205[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ 253[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
206&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling" 254&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
207 255
208[[ "${PN}" == "mariadb" ]] \ 256[[ "${PN}" == "mariadb" ]] \
209&& 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"
210 264
211# MariaDB has integrated PBXT 265# MariaDB has integrated PBXT
212# 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
213# PBXT was only introduced after 5.1.12 267# PBXT was only introduced after 5.1.12
214pbxt_patch_available() { 268pbxt_patch_available() {
… …
232 && mysql_version_is_at_least "5.1.26" \ 286 && mysql_version_is_at_least "5.1.26" \
233 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] 287 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
234 return $? 288 return $?
235} 289}
236 290
291
237pbxt_patch_available \ 292pbxt_patch_available \
238&& PBXT_P="pbxt-${PBXT_VERSION}" \ 293&& PBXT_P="pbxt-${PBXT_VERSION}" \
239&& 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" \
240&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \ 295&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
241 296
297# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
298# vs. built outside the dir
242pbxt_available \ 299pbxt_available \
243&& IUSE="${IUSE} pbxt" 300&& IUSE="${IUSE} pbxt" \
301&& mysql_version_is_at_least "5.1.40" \
302&& PBXT_NEWSTYLE=1
244 303
245xtradb_patch_available \ 304xtradb_patch_available \
246&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \ 305&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
247&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \ 306&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
248&& 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}" \
249&& 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}" \
250&& 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} )" \
251&& IUSE="${IUSE} xtradb" 313&& IUSE="${IUSE} xtradb"
252 314
253# 315#
254# HELPER FUNCTIONS: 316# HELPER FUNCTIONS:
255# 317#
… …
260mysql_disable_test() { 322mysql_disable_test() {
261 local rawtestname testname testsuite reason mysql_disable_file 323 local rawtestname testname testsuite reason mysql_disable_file
262 rawtestname="${1}" ; shift 324 rawtestname="${1}" ; shift
263 reason="${@}" 325 reason="${@}"
264 ewarn "test '${rawtestname}' disabled: '${reason}'" 326 ewarn "test '${rawtestname}' disabled: '${reason}'"
265 327
266 testsuite="${rawtestname/.*}" 328 testsuite="${rawtestname/.*}"
267 testname="${rawtestname/*.}" 329 testname="${rawtestname/*.}"
268 mysql_disable_file="${S}/mysql-test/t/disabled.def" 330 mysql_disable_file="${S}/mysql-test/t/disabled.def"
269 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" 331 #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
270 echo ${testname} : ${reason} >> "${mysql_disable_file}" 332 echo ${testname} : ${reason} >> "${mysql_disable_file}"
… …
300# @DESCRIPTION: 362# @DESCRIPTION:
301# void mysql_init_vars() 363# void mysql_init_vars()
302# Initialize global variables 364# Initialize global variables
303# 2005-11-19 <vivo@gentoo.org> 365# 2005-11-19 <vivo@gentoo.org>
304mysql_init_vars() { 366mysql_init_vars() {
305 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"} 367 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
306 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} 368 MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
307 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 369 MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
308 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 370 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
309 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 371 MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
310 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 372 MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
311 373
312 if [[ -z "${MY_DATADIR}" ]] ; then 374 if [[ -z "${MY_DATADIR}" ]] ; then
313 MY_DATADIR="" 375 MY_DATADIR=""
314 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 376 if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
315 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 377 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
316 | sed -ne '/datadir/s|^--datadir=||p' \ 378 | sed -ne '/datadir/s|^--datadir=||p' \
317 | tail -n1` 379 | tail -n1`
318 if [[ -z "${MY_DATADIR}" ]] ; then 380 if [[ -z "${MY_DATADIR}" ]] ; then
319 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 381 MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
320 | sed -e 's/.*=\s*//' \ 382 | sed -e 's/.*=\s*//' \
321 | tail -n1` 383 | tail -n1`
322 fi 384 fi
323 fi 385 fi
324 if [[ -z "${MY_DATADIR}" ]] ; then 386 if [[ -z "${MY_DATADIR}" ]] ; then
… …
352 MY_DATADIR="${new_MY_DATADIR}" 414 MY_DATADIR="${new_MY_DATADIR}"
353 fi 415 fi
354 fi 416 fi
355 fi 417 fi
356 418
419 if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
357 MY_SOURCEDIR=${SERVER_URI##*/} 420 MY_SOURCEDIR=${SERVER_URI##*/}
358 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 421 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
422 fi
359 423
360 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 424 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
361 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 425 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
362 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR 426 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
363} 427}
… …
394 myconf="${myconf} $(use_with big-tables)" 458 myconf="${myconf} $(use_with big-tables)"
395 myconf="${myconf} --enable-local-infile" 459 myconf="${myconf} --enable-local-infile"
396 myconf="${myconf} --with-extra-charsets=all" 460 myconf="${myconf} --with-extra-charsets=all"
397 myconf="${myconf} --with-mysqld-user=mysql" 461 myconf="${myconf} --with-mysqld-user=mysql"
398 myconf="${myconf} --with-server" 462 myconf="${myconf} --with-server"
399 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 463 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
400 myconf="${myconf} --without-libwrap" 464 myconf="${myconf} --without-libwrap"
401 465
402 if use static ; then 466 if use static ; then
403 myconf="${myconf} --with-mysqld-ldflags=-all-static" 467 myconf="${myconf} --with-mysqld-ldflags=-all-static"
404 myconf="${myconf} --with-client-ldflags=-all-static" 468 myconf="${myconf} --with-client-ldflags=-all-static"
… …
410 if use debug ; then 474 if use debug ; then
411 myconf="${myconf} --with-debug=full" 475 myconf="${myconf} --with-debug=full"
412 else 476 else
413 myconf="${myconf} --without-debug" 477 myconf="${myconf} --without-debug"
414 mysql_version_is_at_least "4.1.3" \ 478 mysql_version_is_at_least "4.1.3" \
415 && use cluster \ 479 && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
416 && myconf="${myconf} --without-ndb-debug" 480 && myconf="${myconf} --without-ndb-debug"
417 fi 481 fi
418 482
419 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then 483 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
420 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" 484 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
… …
439 fi 503 fi
440 504
441} 505}
442 506
443configure_40_41_50() { 507configure_40_41_50() {
508 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
444 myconf="${myconf} $(use_with perl bench)" 509 myconf="${myconf} $(use_with perl bench)"
445 myconf="${myconf} --enable-assembler" 510 myconf="${myconf} --enable-assembler"
446 myconf="${myconf} --with-extra-tools" 511 myconf="${myconf} --with-extra-tools"
447 myconf="${myconf} --with-innodb" 512 myconf="${myconf} --with-innodb"
448 myconf="${myconf} --without-readline" 513 myconf="${myconf} --without-readline"
449 myconf="${myconf} $(use_with ssl openssl)" 514 myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
450 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)"
451 516
452 # --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
453 # has been removed from configure 518 # has been removed from configure
454 # Apply to 4.x and 5.0.[0-3] 519 # Apply to 4.x and 5.0.[0-3]
… …
477 myconf="${myconf} --without-berkeley-db" 542 myconf="${myconf} --without-berkeley-db"
478 fi 543 fi
479 544
480 if mysql_version_is_at_least "4.1.3" ; then 545 if mysql_version_is_at_least "4.1.3" ; then
481 myconf="${myconf} --with-geometry" 546 myconf="${myconf} --with-geometry"
547 if [[ "${PN}" != "mysql-cluster" ]] ; then
482 myconf="${myconf} $(use_with cluster ndbcluster)" 548 myconf="${myconf} $(use_with cluster ndbcluster)"
549 fi
483 fi 550 fi
484 551
485 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
486 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 553 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
487 myconf="${myconf} --with-archive-storage-engine" 554 myconf="${myconf} --with-archive-storage-engine"
… …
518 585
519configure_51() { 586configure_51() {
520 # TODO: !!!! readd --without-readline 587 # TODO: !!!! readd --without-readline
521 # the failure depend upon config/ac-macros/readline.m4 checking into 588 # the failure depend upon config/ac-macros/readline.m4 checking into
522 # readline.h instead of history.h 589 # readline.h instead of history.h
523 myconf="${myconf} $(use_with ssl ssl /usr)" 590 myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
524 myconf="${myconf} --enable-assembler" 591 myconf="${myconf} --enable-assembler"
525 myconf="${myconf} --with-geometry" 592 myconf="${myconf} --with-geometry"
526 myconf="${myconf} --with-readline" 593 myconf="${myconf} --with-readline"
527 myconf="${myconf} --with-zlib-dir=/usr/" 594 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
528 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"
529 use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 601 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
530 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then 602 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
531 myconf="${myconf} $(use_enable community community-features)" 603 myconf="${myconf} $(use_enable community community-features)"
532 if use community; then 604 if use community; then
533 myconf="${myconf} $(use_enable profiling)" 605 myconf="${myconf} $(use_enable profiling)"
534 else 606 else
535 myconf="${myconf} --disable-profiling" 607 myconf="${myconf} --disable-profiling"
536 fi 608 fi
537 fi 609 fi
538 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
539 # 5.1 introduces a new way to manage storage engines (plugins) 629 # 5.1 introduces a new way to manage storage engines (plugins)
540 # like configuration=none 630 # like configuration=none
541 # This base set are required, and will always be statically built. 631 # This base set are required, and will always be statically built.
542 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
543 if use extraengine ; then 644 if use extraengine ; then
544 # 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
545 # not added yet: ibmdb2i 646 # not added yet: ibmdb2i
546 # Not supporting as examples: example,daemon_example,ftexample 647 # Not supporting as examples: example,daemon_example,ftexample
547 plugins="${plugins},archive,blackhole,federated,partition" 648 plugins_sta="${plugins_sta} partition"
548 649
549 if [[ "${PN}" != "mariadb" ]] ; then 650 if [[ "${PN}" != "mariadb" ]] ; then
550 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"
551 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"
552 else 654 else
553 elog "MariaDB includes the FederatedX engine. Be sure to read" 655 elog "MariaDB includes the FederatedX engine. Be sure to read"
554 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"
555 fi 658 fi
659 else
660 plugins_dis="${plugins_dis} partition federated"
556 fi 661 fi
557 662
558 # Upstream specifically requests that InnoDB always be built: 663 # Upstream specifically requests that InnoDB always be built:
559 # - innobase, innodb_plugin 664 # - innobase, innodb_plugin
560 # Build falcon if available for 6.x series. 665 # Build falcon if available for 6.x series.
561 for i in innobase innodb_plugin falcon ; do 666 for i in innobase falcon ; do
562 [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}" 667 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
563 done 668 done
669 for i in innodb_plugin ; do
670 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
671 done
564 672
565 # like configuration=max-no-ndb 673 # like configuration=max-no-ndb
566 if use cluster ; then 674 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
567 plugins="${plugins},ndbcluster" 675 plugins_sta="${plugins_sta} ndbcluster partition"
676 plugins_dis="${plugins_dis//partition}"
568 myconf="${myconf} --with-ndb-binlog" 677 myconf="${myconf} --with-ndb-binlog"
678 else
679 plugins_dis="${plugins_dis} ndbcluster"
569 fi 680 fi
570 681
571 if [[ "${PN}" == "mariadb" ]] ; then 682 if [[ "${PN}" == "mariadb" ]] ; then
572 # 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
573 # caught above. 684 # caught above.
574 plugins="${plugins},maria,innobase"
575 if use pbxt ; then
576 plugins="${plugins},pbxt"
577 else
578 myconf="${myconf} --without-plugin-pbxt"
579 fi
580 myconf="${myconf} $(use_with libevent)"
581 # This is not optional, without it several upstream testcases fail. 685 # This is not optional, without it several upstream testcases fail.
582 # Also strongly recommended by upstream. 686 # Also strongly recommended by upstream.
687 if [[ "${PV}" < "5.2.0" ]] ; then
583 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"
584 fi 693 fi
585 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_dyn="${plugins_dyn} 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
586 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
587} 736}
588 737
589pbxt_src_configure() { 738pbxt_src_configure() {
590 mysql_init_vars 739 mysql_init_vars
591 740
592 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 741 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
593 742
594 einfo "Reconfiguring dir '${PWD}'" 743 einfo "Reconfiguring dir '${PWD}'"
595 AT_GNUCONF_UPDATE="yes" eautoreconf 744 eautoreconf
596 745
597 local myconf="" 746 local myconf=""
598 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 747 myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
599 use debug && myconf="${myconf} --with-debug=full" 748 use debug && myconf="${myconf} --with-debug=full"
600 econf ${myconf} || die "Problem configuring PBXT storage engine" 749 econf ${myconf} || die "Problem configuring PBXT storage engine"
601} 750}
602 751
603pbxt_src_compile() { 752pbxt_src_compile() {
753
604 # Be backwards compatible for now 754 # Be backwards compatible for now
605 if [[ $EAPI != 2 ]]; then 755 if [[ $EAPI != 2 ]]; then
606 pbxt_src_configure 756 pbxt_src_configure
607 fi 757 fi
608 # TODO: is it safe/needed to use emake here ? 758 # TODO: is it safe/needed to use emake here ?
… …
627# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" 777# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
628# check for conflicting use flags 778# check for conflicting use flags
629# create new user and group for mysql 779# create new user and group for mysql
630# warn about deprecated features 780# warn about deprecated features
631mysql_pkg_setup() { 781mysql_pkg_setup() {
632 if hasq test ${FEATURES} ; then 782 if has test ${FEATURES} ; then
633 if ! use minimal ; then 783 if ! use minimal ; then
634 if [[ $UID -eq 0 ]]; then 784 if [[ $UID -eq 0 ]]; then
635 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."
636 fi 786 fi
637 fi 787 fi
638 fi 788 fi
639 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
640 # Check for USE flag problems in pkg_setup 799 # Check for USE flag problems in pkg_setup
641 if use static && use ssl ; then 800 if use static && use ssl ; then
642 eerror "MySQL does not support being built statically with SSL support enabled!"
643 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"
644 fi 811 fi
645 812
646 if ! mysql_version_is_at_least "5.0" \ 813 if ! mysql_version_is_at_least "5.0" \
647 && use raid \ 814 && use raid \
648 && use static ; then 815 && use static ; then
… …
650 eerror "with RAID support enabled." 817 eerror "with RAID support enabled."
651 die "USE flags 'raid' and 'static' conflict!" 818 die "USE flags 'raid' and 'static' conflict!"
652 fi 819 fi
653 820
654 if mysql_version_is_at_least "4.1.3" \ 821 if mysql_version_is_at_least "4.1.3" \
655 && ( use cluster || use extraengine ) \ 822 && ( use cluster || use extraengine || use embedded ) \
656 && use minimal ; then 823 && use minimal ; then
657 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
658 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}"
659 fi 827 fi
660 828
661 # Bug #290570 fun. Upstream made us need a fairly new GCC4.
662 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
663 GCC_VER=$(gcc-version) 842 GCC_VER=$(gcc-version)
664 case ${GCC_VER} in 843 case ${CHOST}:${GCC_VER} in
665 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!" ;;
666 esac 850 esac
667 fi 851 fi
668 852
669 # This should come after all of the die statements 853 # This should come after all of the die statements
670 enewgroup mysql 60 || die "problem adding 'mysql' group" 854 enewgroup mysql 60 || die "problem adding 'mysql' group"
… …
720 mysql_mv_patches 904 mysql_mv_patches
721 # And apply 905 # And apply
722 epatch 906 epatch
723 907
724 # last -fPIC fixup, per bug #305873 908 # last -fPIC fixup, per bug #305873
725 i="${S}"/storage/innodb_plugin/plug.in 909 i="${S}"/storage/innodb_plugin/plug.in
726 [ -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}"
727 911
728 # 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
729 rm -f "${S}/zlib/"*.[ch] 915 rm -f "${S}/zlib/"*.[ch]
730 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
731 rm -f "scripts/mysqlbug" 918 rm -f "scripts/mysqlbug"
732 919
733 # Make charsets install in the right place 920 # Make charsets install in the right place
734 find . -name 'Makefile.am' \ 921 find . -name 'Makefile.am' \
735 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 922 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
… …
746 fi 933 fi
747 934
748 local rebuilddirlist d 935 local rebuilddirlist d
749 936
750 if xtradb_patch_available && use xtradb ; then 937 if xtradb_patch_available && use xtradb ; then
751 einfo "Replacing InnoDB with Percona XtraDB" 938 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
752 pushd "${S}"/storage 939 pushd "${S}"/storage >/dev/null
753 i="innobase" 940 i="innobase"
754 o="${WORKDIR}/storage-${i}.mysql-upstream" 941 o="${WORKDIR}/storage-${i}.mysql-upstream"
755 # Have we been here already? 942 # Have we been here already?
756 [ -d "${o}" ] && rm -f "${i}" 943 [ -d "${o}" ] && rm -f "${i}"
757 # Or maybe we haven't 944 # Or maybe we haven't
758 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 945 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
759 cp -ra "${WORKDIR}/${XTRADB_P}" "${i}" 946 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
760 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
761 fi 957 fi
762 958
763 if mysql_version_is_at_least "5.1.12" ; then 959 if mysql_version_is_at_least "5.1.12" ; then
764 rebuilddirlist="." 960 rebuilddirlist="."
765 # 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
… …
774 fi 970 fi
775 971
776 for d in ${rebuilddirlist} ; do 972 for d in ${rebuilddirlist} ; do
777 einfo "Reconfiguring dir '${d}'" 973 einfo "Reconfiguring dir '${d}'"
778 pushd "${d}" &>/dev/null 974 pushd "${d}" &>/dev/null
779 AT_GNUCONF_UPDATE="yes" eautoreconf 975 eautoreconf
780 popd &>/dev/null 976 popd &>/dev/null
781 done 977 done
782 978
783 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" \
784 && use berkdb ; then 980 && use berkdb ; then
785 einfo "Fixing up berkdb buildsystem" 981 einfo "Fixing up berkdb buildsystem"
786 [[ -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"
787 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" \
788 || die "Could not copy libtool.m4 to bdb/dist/" 984 || die "Could not copy libtool.m4 to bdb/dist/"
789 #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.
790 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 986 if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
791 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" 987 cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
792 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" 988 cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
793 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"
794 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" 990 cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
795 fi 991 fi
796 pushd "bdb/dist" &>/dev/null 992 pushd "bdb/dist" &>/dev/null
797 sh s_all \ 993 sh s_all \
798 || die "Failed bdb reconfigure" 994 || die "Failed bdb reconfigure"
799 popd &>/dev/null 995 popd &>/dev/null
… …
840 export CXXFLAGS 1036 export CXXFLAGS
841 1037
842 # 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.
843 append-flags -fno-strict-aliasing 1039 append-flags -fno-strict-aliasing
844 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
845 econf \ 1050 econf \
846 --libexecdir="/usr/sbin" \ 1051 --libexecdir="${EPREFIX}"/usr/sbin \
847 --sysconfdir="${MY_SYSCONFDIR}" \ 1052 --sysconfdir=${MY_SYSCONFDIR} \
848 --localstatedir="${MY_LOCALSTATEDIR}" \ 1053 --localstatedir=${MY_LOCALSTATEDIR} \
849 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1054 --sharedstatedir=${MY_SHAREDSTATEDIR} \
850 --libdir="${MY_LIBDIR}" \ 1055 --libdir=${MY_LIBDIR} \
851 --includedir="${MY_INCLUDEDIR}" \ 1056 --includedir=${MY_INCLUDEDIR} \
852 --with-low-memory \ 1057 --with-low-memory \
853 --with-client-ldflags=-lstdc++ \ 1058 --with-client-ldflags=-lstdc++ \
854 --enable-thread-safe-client \ 1059 --enable-thread-safe-client \
855 --with-comment="Gentoo Linux ${PF}" \ 1060 --with-comment="Gentoo Linux ${PF}" \
856 --without-docs \ 1061 --without-docs \
1062 --with-LIBDIR="$(get_libdir)" \
857 ${myconf} || die "econf failed" 1063 ${myconf} || die "econf failed"
858 1064
859 # TODO: Move this before autoreconf !!! 1065 # TODO: Move this before autoreconf !!!
860 find . -type f -name Makefile -print0 \ 1066 find . -type f -name Makefile -print0 \
861 | xargs -0 -n100 sed -i \ 1067 | xargs -0 -n100 sed -i \
862 -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)|'
863 1069
864 if [[ $EAPI == 2 ]]; then 1070 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
865 pbxt_patch_available && use pbxt && pbxt_src_configure 1071 pbxt_patch_available && use pbxt && pbxt_src_configure
866 fi 1072 fi
867} 1073}
868 1074
869# @FUNCTION: mysql_src_compile 1075# @FUNCTION: mysql_src_compile
… …
876 0 | 1) mysql_src_configure ;; 1082 0 | 1) mysql_src_configure ;;
877 esac 1083 esac
878 1084
879 emake || die "emake failed" 1085 emake || die "emake failed"
880 1086
1087 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
881 pbxt_patch_available && use pbxt && pbxt_src_compile 1088 pbxt_patch_available && use pbxt && pbxt_src_compile
1089 fi
882} 1090}
883 1091
884# @FUNCTION: mysql_src_install 1092# @FUNCTION: mysql_src_install
885# @DESCRIPTION: 1093# @DESCRIPTION:
886# Install mysql. 1094# Install mysql.
… …
888 # Make sure the vars are correctly initialized 1096 # Make sure the vars are correctly initialized
889 mysql_init_vars 1097 mysql_init_vars
890 1098
891 emake install \ 1099 emake install \
892 DESTDIR="${D}" \ 1100 DESTDIR="${D}" \
893 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1101 benchdir_root=${MY_SHAREDSTATEDIR} \
894 testroot="${MY_SHAREDSTATEDIR}" \ 1102 testroot="${MY_SHAREDSTATEDIR}" \
895 || die "emake install failed" 1103 || die "emake install failed"
896 1104
1105 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
897 pbxt_patch_available && use pbxt && pbxt_src_install 1106 pbxt_patch_available && use pbxt && pbxt_src_install
1107 fi
898 1108
899 # Convenience links 1109 # Convenience links
900 einfo "Making Convenience links for mysqlcheck multi-call binary" 1110 einfo "Making Convenience links for mysqlcheck multi-call binary"
901 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 1111 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
902 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1112 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
903 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 1113 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
904 1114
905 # Various junk (my-*.cnf moved elsewhere) 1115 # Various junk (my-*.cnf moved elsewhere)
906 einfo "Removing duplicate /usr/share/mysql files" 1116 einfo "Removing duplicate /usr/share/mysql files"
907 rm -Rf "${D}/usr/share/info" 1117 rm -Rf "${ED}/usr/share/info"
908 for removeme in "mysql-log-rotate" mysql.server* \ 1118 for removeme in "mysql-log-rotate" mysql.server* \
909 binary-configure* my-*.cnf mi_test_all* 1119 binary-configure* my-*.cnf mi_test_all*
910 do 1120 do
911 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} 1121 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
912 done 1122 done
913 1123
914 # Clean up stuff for a minimal build 1124 # Clean up stuff for a minimal build
915 if use minimal ; then 1125 if use minimal ; then
916 einfo "Remove all extra content for minimal build" 1126 einfo "Remove all extra content for minimal build"
917 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 1127 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
918 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}
919 rm -f "${D}/usr/sbin/mysqld" 1129 rm -f "${ED}/usr/sbin/mysqld"
920 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
921 fi 1131 fi
922 1132
923 # Unless they explicitly specific USE=test, then do not install the 1133 # Unless they explicitly specific USE=test, then do not install the
924 # 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
… …
926 if use !test ; then 1136 if use !test ; then
927 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test 1137 rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
928 fi 1138 fi
929 1139
930 # Configuration stuff 1140 # Configuration stuff
931 if mysql_version_is_at_least "5.1" ; then 1141 case ${MYSQL_PV_MAJOR} in
932 mysql_mycnf_version="5.1"
933 elif mysql_version_is_at_least "4.1" ; then
934 mysql_mycnf_version="4.1"
935 else
936 mysql_mycnf_version="4.0" 1142 3*|4.0) mysql_mycnf_version="4.0" ;;
937 fi 1143 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
938 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})"
939 insinto "${MY_SYSCONFDIR}" 1147 insinto "${MY_SYSCONFDIR#${EPREFIX}}"
940 doins scripts/mysqlaccess.conf 1148 doins scripts/mysqlaccess.conf
1149 mycnf_src="my.cnf-${mysql_mycnf_version}"
941 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1150 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
942 "${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}" \
943 > "${TMPDIR}/my.cnf.ok" 1155 > "${TMPDIR}/my.cnf.ok"
944 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
945 sed -i \ 1158 sed -i \
946 -e "/character-set/s|utf8|latin1|g" \ 1159 -e "/character-set/s|utf8|latin1|g" \
947 "${TMPDIR}/my.cnf.ok" 1160 "${TMPDIR}/my.cnf.ok"
948 fi 1161 fi
949 newins "${TMPDIR}/my.cnf.ok" my.cnf 1162 newins "${TMPDIR}/my.cnf.ok" my.cnf
… …
952 if ! use minimal ; then 1165 if ! use minimal ; then
953 einfo "Creating initial directories" 1166 einfo "Creating initial directories"
954 # Empty directories ... 1167 # Empty directories ...
955 diropts "-m0750" 1168 diropts "-m0750"
956 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 1169 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
957 dodir "${MY_DATADIR}" 1170 dodir "${MY_DATADIR#${EPREFIX}}"
958 keepdir "${MY_DATADIR}" 1171 keepdir "${MY_DATADIR#${EPREFIX}}"
959 chown -R mysql:mysql "${D}/${MY_DATADIR}" 1172 chown -R mysql:mysql "${D}/${MY_DATADIR}"
960 fi 1173 fi
961 1174
962 diropts "-m0755" 1175 diropts "-m0755"
963 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 1176 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
964 dodir "${folder}" 1177 dodir "${folder}"
965 keepdir "${folder}" 1178 keepdir "${folder}"
966 chown -R mysql:mysql "${D}/${folder}" 1179 chown -R mysql:mysql "${ED}/${folder}"
967 done 1180 done
968 fi 1181 fi
969 1182
970 # Docs 1183 # Docs
971 einfo "Installing docs" 1184 einfo "Installing docs"
972 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
973 doinfo "${S}"/Docs/mysql.info 1188 doinfo "${S}"/Docs/mysql.info
974 1189
975 # Minimal builds don't have the MySQL server 1190 # Minimal builds don't have the MySQL server
976 if ! use minimal ; then 1191 if ! use minimal ; then
977 einfo "Including support files and sample configurations" 1192 einfo "Including support files and sample configurations"
… …
989 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1204 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
990 done 1205 done
991 1206
992 fi 1207 fi
993 1208
994 mysql_lib_symlinks "${D}" 1209 mysql_lib_symlinks "${ED}"
995} 1210}
996 1211
997# @FUNCTION: mysql_pkg_preinst 1212# @FUNCTION: mysql_pkg_preinst
998# @DESCRIPTION: 1213# @DESCRIPTION:
999# Create the user and groups for mysql - die if that fails. 1214# Create the user and groups for mysql - die if that fails.
… …
1013mysql_pkg_postinst() { 1228mysql_pkg_postinst() {
1014 # Make sure the vars are correctly initialized 1229 # Make sure the vars are correctly initialized
1015 mysql_init_vars 1230 mysql_init_vars
1016 1231
1017 # Check FEATURES="collision-protect" before removing this 1232 # Check FEATURES="collision-protect" before removing this
1018 [[ -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}"
1019 1234
1020 # Secure the logfiles 1235 # Secure the logfiles
1021 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 1236 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
1022 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 1237 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
1023 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 1238 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
… …
1043 1258
1044 einfo 1259 einfo
1045 elog "You might want to run:" 1260 elog "You might want to run:"
1046 elog "\"emerge --config =${CATEGORY}/${PF}\"" 1261 elog "\"emerge --config =${CATEGORY}/${PF}\""
1047 elog "if this is a new install." 1262 elog "if this is a new install."
1263 einfo
1264
1265 einfo
1266 elog "If you are upgrading major versions, you should run the"
1267 elog "mysql_upgrade tool."
1048 einfo 1268 einfo
1049 fi 1269 fi
1050 1270
1051 if pbxt_available && use pbxt ; then 1271 if pbxt_available && use pbxt ; then
1052 # TODO: explain it better 1272 # TODO: explain it better
… …
1107 fi 1327 fi
1108 fi 1328 fi
1109 1329
1110 local pwd1="a" 1330 local pwd1="a"
1111 local pwd2="b" 1331 local pwd2="b"
1112 local MYSQL_ROOT_PASSWORD=''
1113 local maxtry=15 1332 local maxtry=15
1114 1333
1115 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then 1334 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
1116 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")" 1335 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
1117 fi 1336 fi
1118 1337
1119 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1338 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1120 ewarn "You have already a MySQL database in place." 1339 ewarn "You have already a MySQL database in place."
1121 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1340 ewarn "(${ROOT}/${MY_DATADIR}/*)"
… …
1127 # localhost. Also causes weird failures. 1346 # localhost. Also causes weird failures.
1128 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" 1347 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
1129 1348
1130 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then 1349 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
1131 1350
1132 einfo "Please provide a password for the mysql 'root' user now," 1351 einfo "Please provide a password for the mysql 'root' user now, in the"
1133 einfo "or in the MYSQL_ROOT_PASSWORD env var." 1352 einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
1134 ewarn "Avoid [\"'\\_%] characters in the password" 1353 ewarn "Avoid [\"'\\_%] characters in the password"
1135 read -rsp " >" pwd1 ; echo 1354 read -rsp " >" pwd1 ; echo
1136 1355
1137 einfo "Retype the password" 1356 einfo "Retype the password"
1138 read -rsp " >" pwd2 ; echo 1357 read -rsp " >" pwd2 ; echo
… …
1152 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 1371 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
1153 || touch "${TMPDIR}/fill_help_tables.sql" 1372 || touch "${TMPDIR}/fill_help_tables.sql"
1154 help_tables="${TMPDIR}/fill_help_tables.sql" 1373 help_tables="${TMPDIR}/fill_help_tables.sql"
1155 1374
1156 pushd "${TMPDIR}" &>/dev/null 1375 pushd "${TMPDIR}" &>/dev/null
1157 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1 1376 "${EROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
1158 if [ $? -ne 0 ]; then 1377 if [ $? -ne 0 ]; then
1159 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 1378 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
1160 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" 1379 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
1161 fi 1380 fi
1162 popd &>/dev/null 1381 popd &>/dev/null
… …
1165 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1384 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1166 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1385 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1167 1386
1168 # Figure out which options we need to disable to do the setup 1387 # Figure out which options we need to disable to do the setup
1169 helpfile="${TMPDIR}/mysqld-help" 1388 helpfile="${TMPDIR}/mysqld-help"
1170 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null 1389 ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1171 for opt in grant-tables host-cache name-resolve networking slave-start bdb \ 1390 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1172 federated innodb ssl log-bin relay-log slow-query-log external-locking \ 1391 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1392 ndbcluster \
1173 ; do 1393 ; do
1174 optexp="--(skip-)?${opt}" optfull="--skip-${opt}" 1394 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1175 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" 1395 egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
1176 done 1396 done
1177 # But some options changed names 1397 # But some options changed names
… …
1179 options="${options/skip-locking/skip-external-locking}" 1399 options="${options/skip-locking/skip-external-locking}"
1180 1400
1181 if mysql_version_is_at_least "4.1.3" ; then 1401 if mysql_version_is_at_least "4.1.3" ; then
1182 # Filling timezones, see 1402 # Filling timezones, see
1183 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1403 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1184 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1404 "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
1185 1405
1186 if [[ -r "${help_tables}" ]] ; then 1406 if [[ -r "${help_tables}" ]] ; then
1187 cat "${help_tables}" >> "${sqltmp}" 1407 cat "${help_tables}" >> "${sqltmp}"
1188 fi 1408 fi
1189 fi 1409 fi
1190 1410
1191 einfo "Creating the mysql database and setting proper" 1411 einfo "Creating the mysql database and setting proper"
1192 einfo "permissions on it ..." 1412 einfo "permissions on it ..."
1193 1413
1414 use prefix || options="${options} --user=mysql"
1415
1194 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1416 local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1195 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1417 local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1196 local mysqld="${ROOT}/usr/sbin/mysqld \ 1418 local mysqld="${EROOT}/usr/sbin/mysqld \
1197 ${options} \ 1419 ${options} \
1198 --user=mysql \ 1420 --user=mysql \
1199 --basedir=${ROOT}/usr \ 1421 --basedir=${EROOT}/usr \
1200 --datadir=${ROOT}/${MY_DATADIR} \ 1422 --datadir=${ROOT}/${MY_DATADIR} \
1201 --max_allowed_packet=8M \ 1423 --max_allowed_packet=8M \
1202 --net_buffer_length=16K \ 1424 --net_buffer_length=16K \
1425 --default-storage-engine=MyISAM \
1203 --socket=${socket} \ 1426 --socket=${socket} \
1204 --pid-file=${pidfile}" 1427 --pid-file=${pidfile}"
1205 #einfo "About to start mysqld: ${mysqld}" 1428 #einfo "About to start mysqld: ${mysqld}"
1206 ebegin "Starting mysqld" 1429 ebegin "Starting mysqld"
1207 ${mysqld} & 1430 ${mysqld} &
… …
1218 fi 1441 fi
1219 1442
1220 ebegin "Setting root password" 1443 ebegin "Setting root password"
1221 # Do this from memory, as we don't want clear text passwords in temp files 1444 # Do this from memory, as we don't want clear text passwords in temp files
1222 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" 1445 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1223 "${ROOT}/usr/bin/mysql" \ 1446 "${EROOT}/usr/bin/mysql" \
1224 --socket=${socket} \ 1447 --socket=${socket} \
1225 -hlocalhost \ 1448 -hlocalhost \
1226 -e "${sql}" 1449 -e "${sql}"
1227 eend $? 1450 eend $?
1228 1451
1229 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..." 1452 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1230 "${ROOT}/usr/bin/mysql" \ 1453 "${EROOT}/usr/bin/mysql" \
1231 --socket=${socket} \ 1454 --socket=${socket} \
1232 -hlocalhost \ 1455 -hlocalhost \
1233 -uroot \ 1456 -uroot \
1234 -p"${MYSQL_ROOT_PASSWORD}" \ 1457 -p"${MYSQL_ROOT_PASSWORD}" \
1235 mysql < "${sqltmp}" 1458 mysql < "${sqltmp}"
… …
1247 1470
1248# @FUNCTION: mysql_pkg_postrm 1471# @FUNCTION: mysql_pkg_postrm
1249# @DESCRIPTION: 1472# @DESCRIPTION:
1250# Remove mysql symlinks. 1473# Remove mysql symlinks.
1251mysql_pkg_postrm() { 1474mysql_pkg_postrm() {
1252 : # mysql_lib_symlinks "${D}" 1475 : # mysql_lib_symlinks "${ED}"
1253} 1476}
Legend:
Removed from v.1.142  
changed lines
  Added in v.1.170
  ViewVC Help
Powered by ViewVC 1.1.20