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

Diff of /eclass/mysql.eclass

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

Revision 1.60 Revision 1.78
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2007 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.60 2007/01/05 11:09:34 vivo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.78 2007/05/11 08:25:11 robbat2 Exp $
4# kate: encoding utf-8; eol unix;
5# kate: indent-width 4; mixedindent off; remove-trailing-space on; space-indent off;
6# kate: word-wrap-column 80; word-wrap off;
7 4
8# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 5# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
9# Maintainer: Luca Longinotti <chtekk@gentoo.org> 6# Maintainer: Luca Longinotti <chtekk@gentoo.org>
10 7
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too!
11# Note that MYSQL_VERSION_ID must be empty !!! 9# Note that MYSQL_VERSION_ID must be empty!
12 10
13ECLASS="mysql"
14INHERITED="$INHERITED $ECLASS"
15WANT_AUTOCONF="latest" 11WANT_AUTOCONF="latest"
16WANT_AUTOMAKE="latest" 12WANT_AUTOMAKE="latest"
13
17inherit eutils flag-o-matic gnuconfig autotools mysql_fx 14inherit eutils flag-o-matic gnuconfig autotools mysql_fx
18 15
19# Shorten the path because the socket path length must be shorter than 107 chars 16# Shorten the path because the socket path length must be shorter than 107 chars
20# and we will run a mysql server during test phase 17# and we will run a mysql server during test phase
21S="${WORKDIR}/mysql" 18S="${WORKDIR}/mysql"
22 19
23[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070105" 20[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108"
24 21
25if [[ ${PR#r} -lt 60 ]] ; then 22if [[ ${PR#r} -lt 60 ]] ; then
26 IS_BITKEEPER=0 23 IS_BITKEEPER=0
27elif [[ ${PR#r} -lt 90 ]] ; then 24elif [[ ${PR#r} -lt 90 ]] ; then
28 IS_BITKEEPER=60 25 IS_BITKEEPER=60
33# MYSQL_VERSION_ID will be: 30# MYSQL_VERSION_ID will be:
34# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 31# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
35# This is an important part, because many of the choices the MySQL ebuild will do 32# This is an important part, because many of the choices the MySQL ebuild will do
36# depend on this variable. 33# depend on this variable.
37# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 34# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
35
38MYSQL_VERSION_ID="" 36MYSQL_VERSION_ID=""
39tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 37tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
40for vatom in 0 1 2 3 ; do 38for vatom in 0 1 2 3 ; do
41 # pad to length 2 39 # pad to length 2
42 tpv[${vatom}]="00${tpv[${vatom}]}" 40 tpv[${vatom}]="00${tpv[${vatom}]}"
49DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 47DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
50 userland_GNU? ( sys-process/procps ) 48 userland_GNU? ( sys-process/procps )
51 >=sys-apps/sed-4 49 >=sys-apps/sed-4
52 >=sys-apps/texinfo-4.7-r1 50 >=sys-apps/texinfo-4.7-r1
53 >=sys-libs/readline-4.1 51 >=sys-libs/readline-4.1
54 >=sys-libs/zlib-1.2.3 52 >=sys-libs/zlib-1.2.3"
55 "
56 53
57# having different flavours at the same time is not a good idea 54# Having different flavours at the same time is not a good idea
58for i in "" "-community" "-slotted" ; do 55for i in "" "-community" ; do
59 [[ "${i}" == ${PN#mysql} ]] || 56 [[ "${i}" == ${PN#mysql} ]] ||
60 DEPEND="${DEPEND} !dev-db/mysql${i}" 57 DEPEND="${DEPEND} !dev-db/mysql${i}"
61done 58done
62 59
63mysql_version_is_at_least "5.1" \ 60mysql_version_is_at_least "5.1" \
64|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 61|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
65 62
63mysql_version_is_at_least "5.1.12" \
64&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"
65
66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 66# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 67PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
68 68
69if mysql_version_is_at_least "5.1.12" ; then
70 DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"
71fi
72
73# BitKeeper dependency, compile-time only 69# BitKeeper dependency, compile-time only
74[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" 70[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
75 71
76if [[ ${PN} == "mysql-slotted" ]] ; then
77 DEPEND="${DEPEND} app-admin/eselect-mysql"
78fi
79
80if [[ ${PN} == "mysql-slotted" ]] ; then
81 SLOT=""
82 tpv=( ${PV//[-._]/ } )
83 for vatom in 0 1 2 ; do
84 SLOT="${SLOT}${tpv[${vatom}]}_"
85 done
86 #finally SLOT=5_0_24
87 SLOT=${SLOT:0:${#SLOT}-1}
88else
89 SLOT="0"
90fi
91
92# Define correct SRC_URIs 72# Define correct SRC_URIs
93SRC_URI=" 73SRC_URI="${SERVER_URI}
94${SERVER_URI} 74 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
95http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 75 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
96"
97mysql_version_is_at_least "5.1.12" \ 76mysql_version_is_at_least "5.1.12" \
98&& [[ -n "${PBXT_VERSION}" ]] \ 77&& [[ -n "${PBXT_VERSION}" ]] \
99&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )" 78&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
100 79
101DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 80DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
102HOMEPAGE="http://www.mysql.com/" 81HOMEPAGE="http://www.mysql.com/"
103LICENSE="GPL-2" 82LICENSE="GPL-2"
83SLOT="0"
104IUSE="big-tables debug embedded minimal perl selinux ssl static" 84IUSE="big-tables debug embedded minimal perl selinux ssl static"
105RESTRICT="confcache" 85RESTRICT="confcache"
106 86
107mysql_version_is_at_least "4.1" \ 87mysql_version_is_at_least "4.1" \
108&& IUSE="${IUSE} latin1" 88&& IUSE="${IUSE} latin1"
124 104
125mysql_version_is_at_least "5.1.12" \ 105mysql_version_is_at_least "5.1.12" \
126&& IUSE="${IUSE} pbxt" 106&& IUSE="${IUSE} pbxt"
127 107
128RDEPEND="${DEPEND} 108RDEPEND="${DEPEND}
129sys-apps/mysql 109 !minimal? ( dev-db/mysql-init-scripts )
130selinux? ( sec-policy/selinux-mysql ) 110 selinux? ( sec-policy/selinux-mysql )"
131"
132 111
133EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 112EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
134 pkg_postinst pkg_config pkg_postrm 113 pkg_postinst pkg_config pkg_postrm
135 114
136# 115#
137# HELPER FUNCTIONS: 116# HELPER FUNCTIONS:
138# 117#
139 118
140bitkeeper_fetch() { 119bitkeeper_fetch() {
141
142 local reposuf 120 local reposuf
143 if [[ -z "${1}" ]] ; then 121 if [[ -z "${1}" ]] ; then
144 local tpv 122 local tpv
145 tpv=( ${PV//[-._]/ } ) 123 tpv=( ${PV//[-._]/ } )
146 reposuf="mysql-${tpv[0]}.${tpv[1]}" 124 reposuf="mysql-${tpv[0]}.${tpv[1]}"
147 else 125 else
148 reposuf="${1}" 126 reposuf="${1}"
149 fi 127 fi
150 einfo "using \"${reposuf}\" repository." 128 einfo "Using '${reposuf}' repository."
151 local repo_uri="bk://mysql.bkbits.net/${reposuf}" 129 local repo_uri="bk://mysql.bkbits.net/${reposuf}"
152 ## -- ebk_store_dir: bitkeeper sources store directory 130 ## -- ebk_store_dir: bitkeeper sources store directory
153 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src" 131 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
154 ## -- ebk_fetch_cmd: bitkeeper fetch command 132 ## -- ebk_fetch_cmd: bitkeeper fetch command
155 # always fetch the latest revision, use -r<revision> if a specified revision is wanted 133 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
156 # hint: does not work 134 # hint: does not work
157 local ebk_fetch_cmd="sfioball" 135 local ebk_fetch_cmd="sfioball"
158 ## -- ebk_update_cmd: bitkeeper update command 136 ## -- ebk_update_cmd: bitkeeper update command
159 local ebk_update_cmd="update" 137 local ebk_update_cmd="update"
160 138
161 #addread "/etc/bitkeeper" 139 # addread "/etc/bitkeeper"
162 addwrite "${ebk_store_dir}" 140 addwrite "${ebk_store_dir}"
163 141
164 if [[ ! -d "${ebk_store_dir}" ]]; then 142 if [[ ! -d "${ebk_store_dir}" ]] ; then
165 debug-print "${FUNCNAME}: initial checkout. creating bitkeeper directory" 143 debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
166 mkdir -p "${ebk_store_dir}" || die "${EBK}: can't mkdir ${ebk_store_dir}." 144 mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}"
167 fi 145 fi
168 146
169 pushd "${ebk_store_dir}" || die "${EBK}: can't chdir to ${ebk_store_dir}" 147 pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}"
170 148
171 local wc_path=${reposuf} 149 local wc_path=${reposuf}
172 150
173 if [[ ! -d "${wc_path}" ]]; then 151 if [[ ! -d "${wc_path}" ]] ; then
174 local options="-r+" 152 local options="-r+"
153
175 # first check out 154 # first checkout
176 einfo "bitkeeper check out start -->" 155 einfo "bitkeeper checkout start -->"
177 einfo " repository: ${repo_uri}" 156 einfo " repository: ${repo_uri}"
157
178 ${ebk_fetch_cmd} ${options} "${repo_uri}" ${wc_path} \ 158 ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
179 || die "${EBK}: can't fetch from ${repo_uri}." 159 || die "BK: couldn't fetch from ${repo_uri}"
180 else 160 else
181 if [[ ! -d "${wc_path}/BK" ]]; then 161 if [[ ! -d "${wc_path}/BK" ]] ; then
182 popd 162 popd
183 die "Look like ${wc_path} is not a bitkeeper path." 163 die "Looks like ${wc_path} is not a bitkeeper path"
184 fi 164 fi
185 165
186 # update working copy 166 # update working copy
187 einfo "bitkeeper update start -->" 167 einfo "bitkeeper update start -->"
188 einfo " repository: ${repo_uri}" 168 einfo " repository: ${repo_uri}"
189 169
190 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \ 170 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
191 || die "BK: can't update from ${repo_uri} to ${wc_path}." 171 || die "BK: couldn't update from ${repo_uri} to ${wc_path}"
192 fi 172 fi
193 173
194 einfo " working copy: ${wc_path}" 174 einfo " working copy: ${wc_path}"
195 cd "${wc_path}" 175 cd "${wc_path}"
196 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}." 176 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}"
197 177
198 echo 178 echo
199 popd 179 popd
200
201} 180}
202 181
203mysql_disable_test() { 182mysql_disable_test() {
204 local testname="${1}" ; shift 183 local testname="${1}" ; shift
205 local reason="${@}" 184 local reason="${@}"
206 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 185 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
207 echo ${testname} : ${reason} >> "${mysql_disable_file}" 186 echo ${testname} : ${reason} >> "${mysql_disable_file}"
208 ewarn "test \"${testname}\" disabled because: \"${reason}\"" 187 ewarn "test '${testname}' disabled: '${reason}'"
209} 188}
210 189
211# void mysql_init_vars() 190# void mysql_init_vars()
212# 191#
213# Initialize global variables 192# Initialize global variables
214# 2005-11-19 <vivo@gentoo.org> 193# 2005-11-19 <vivo@gentoo.org>
215 194
216mysql_init_vars() { 195mysql_init_vars() {
217 if [[ ${SLOT} == "0" ]] ; then
218 MY_SUFFIX=""
219 else
220 MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
221 fi
222 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR:-"/usr/share/mysql${MY_SUFFIX}"} 196 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
223 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql${MY_SUFFIX}"} 197 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
224 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql${MY_SUFFIX}"} 198 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
225 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql${MY_SUFFIX}"} 199 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
226 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"} 200 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
227 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"} 201 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
228 202
229 if [[ -z "${DATADIR}" ]] ; then 203 if [[ -z "${MY_DATADIR}" ]] ; then
230 DATADIR="" 204 MY_DATADIR=""
231 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 205 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
232 DATADIR=`"my_print_defaults${MY_SUFFIX}" mysqld 2>/dev/null \ 206 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
233 | sed -ne '/datadir/s|^--datadir=||p' \ 207 | sed -ne '/datadir/s|^--datadir=||p' \
234 | tail -n1` 208 | tail -n1`
235 if [[ -z "${DATADIR}" ]] ; then 209 if [[ -z "${MY_DATADIR}" ]] ; then
236 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 210 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
237 | sed -e 's/.*=\s*//'` 211 | sed -e 's/.*=\s*//'`
238 fi 212 fi
239 fi 213 fi
240 if [[ -z "${DATADIR}" ]] ; then 214 if [[ -z "${MY_DATADIR}" ]] ; then
241 DATADIR="${MY_LOCALSTATEDIR}" 215 MY_DATADIR="${MY_LOCALSTATEDIR}"
242 einfo "Using default DATADIR" 216 einfo "Using default MY_DATADIR"
243 fi 217 fi
244 elog "MySQL DATADIR is ${DATADIR}" 218 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
245 219
246 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 220 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
247 if [[ -e "${DATADIR}" ]] ; then 221 if [[ -e "${MY_DATADIR}" ]] ; then
248 elog "Previous datadir found, it's YOUR job to change" 222 elog "Previous datadir found, it's YOUR job to change"
249 elog "ownership and take care of it" 223 elog "ownership and take care of it"
250 PREVIOUS_DATADIR="yes" 224 PREVIOUS_DATADIR="yes"
251 else 225 else
252 PREVIOUS_DATADIR="no" 226 PREVIOUS_DATADIR="no"
256 fi 230 fi
257 231
258 MY_SOURCEDIR=${SERVER_URI##*/} 232 MY_SOURCEDIR=${SERVER_URI##*/}
259 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 233 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
260 234
261 export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR 235 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
262 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 236 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
263 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 237 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
264} 238}
265 239
266configure_minimal() { 240configure_minimal() {
267 # These are things we exclude from a minimal build, please 241 # These are things we exclude from a minimal build, please
268 # note that the server actually does get built and installed, 242 # note that the server actually does get built and installed,
273 myconf="${myconf} --without-${i}" 247 myconf="${myconf} --without-${i}"
274 done 248 done
275 myconf="${myconf} --with-extra-charsets=none" 249 myconf="${myconf} --with-extra-charsets=none"
276 myconf="${myconf} --enable-local-infile" 250 myconf="${myconf} --enable-local-infile"
277 251
278 if useq "static" ; then 252 if use static ; then
279 myconf="${myconf} --with-client-ldflags=-all-static" 253 myconf="${myconf} --with-client-ldflags=-all-static"
280 myconf="${myconf} --disable-shared" 254 myconf="${myconf} --disable-shared"
281 else 255 else
282 myconf="${myconf} --enable-shared --enable-static" 256 myconf="${myconf} --enable-shared --enable-static"
283 fi 257 fi
284 258
285 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then 259 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
286 myconf="${myconf} --with-charset=utf8" 260 myconf="${myconf} --with-charset=utf8"
287 myconf="${myconf} --with-collation=utf8_general_ci" 261 myconf="${myconf} --with-collation=utf8_general_ci"
288 else 262 else
289 myconf="${myconf} --with-charset=latin1" 263 myconf="${myconf} --with-charset=latin1"
290 myconf="${myconf} --with-collation=latin1_swedish_ci" 264 myconf="${myconf} --with-collation=latin1_swedish_ci"
298 myconf="${myconf} --with-mysqld-user=mysql" 272 myconf="${myconf} --with-mysqld-user=mysql"
299 myconf="${myconf} --with-server" 273 myconf="${myconf} --with-server"
300 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 274 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
301 myconf="${myconf} --without-libwrap" 275 myconf="${myconf} --without-libwrap"
302 276
303 if useq "static" ; then 277 if use static ; then
304 myconf="${myconf} --with-mysqld-ldflags=-all-static" 278 myconf="${myconf} --with-mysqld-ldflags=-all-static"
305 myconf="${myconf} --with-client-ldflags=-all-static" 279 myconf="${myconf} --with-client-ldflags=-all-static"
306 myconf="${myconf} --disable-shared" 280 myconf="${myconf} --disable-shared"
307 else 281 else
308 myconf="${myconf} --enable-shared --enable-static" 282 myconf="${myconf} --enable-shared --enable-static"
309 fi 283 fi
310 284
311 if useq "debug" ; then 285 if use debug ; then
312 myconf="${myconf} --with-debug=full" 286 myconf="${myconf} --with-debug=full"
313 else 287 else
314 myconf="${myconf} --without-debug" 288 myconf="${myconf} --without-debug"
315 mysql_version_is_at_least "4.1.3" \ 289 mysql_version_is_at_least "4.1.3" \
316 && useq "cluster" \ 290 && use cluster \
317 && myconf="${myconf} --without-ndb-debug" 291 && myconf="${myconf} --without-ndb-debug"
318 fi 292 fi
319 293
320 if mysql_version_is_at_least "4.1" && ! useq "latin1" ; then 294 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
321 myconf="${myconf} --with-charset=utf8" 295 myconf="${myconf} --with-charset=utf8"
322 myconf="${myconf} --with-collation=utf8_general_ci" 296 myconf="${myconf} --with-collation=utf8_general_ci"
323 else 297 else
324 myconf="${myconf} --with-charset=latin1" 298 myconf="${myconf} --with-charset=latin1"
325 myconf="${myconf} --with-collation=latin1_swedish_ci" 299 myconf="${myconf} --with-collation=latin1_swedish_ci"
326 fi 300 fi
327 301
328 if useq "embedded" ; then 302 if use embedded ; then
329 myconf="${myconf} --with-embedded-privilege-control" 303 myconf="${myconf} --with-embedded-privilege-control"
330 myconf="${myconf} --with-embedded-server" 304 myconf="${myconf} --with-embedded-server"
331 else 305 else
332 myconf="${myconf} --without-embedded-privilege-control" 306 myconf="${myconf} --without-embedded-privilege-control"
333 myconf="${myconf} --without-embedded-server" 307 myconf="${myconf} --without-embedded-server"
341 myconf="${myconf} --with-extra-tools" 315 myconf="${myconf} --with-extra-tools"
342 myconf="${myconf} --with-innodb" 316 myconf="${myconf} --with-innodb"
343 myconf="${myconf} --without-readline" 317 myconf="${myconf} --without-readline"
344 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 318 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
345 319
346 if useq "ssl" ; then
347 # --with-vio is not needed anymore, it's on by default and 320 # --with-vio is not needed anymore, it's on by default and
348 # has been removed from configure 321 # has been removed from configure
322 if use ssl ; then
349 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio" 323 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
324 fi
325
350 if mysql_version_is_at_least "5.0.6" ; then 326 if mysql_version_is_at_least "5.1.11" ; then
351 # myconf="${myconf} --with-yassl"
352 myconf="${myconf} --with-ssl" 327 myconf="${myconf} $(use_with ssl)"
328 else
329 myconf="${myconf} $(use_with ssl openssl)"
330 fi
331
332 if use berkdb ; then
333 # The following fix is due to a bug with bdb on SPARC's. See:
334 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
335 # It comes down to non-64-bit safety problems.
336 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
337 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
338 myconf="${myconf} --without-berkeley-db"
353 else 339 else
354 myconf="${myconf} --with-openssl" 340 myconf="${myconf} --with-berkeley-db=./bdb"
355 fi
356 else
357 myconf="${myconf} --without-openssl"
358 fi 341 fi
359 342 else
360 # The following fix is due to a bug with bdb on SPARC's. See:
361 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
362 # It comes down to non-64-bit safety problems.
363 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then
364 elog "Berkeley DB support was disabled due to incompatible arch"
365 myconf="${myconf} --without-berkeley-db" 343 myconf="${myconf} --without-berkeley-db"
366 else
367 if useq "berkdb" ; then
368 myconf="${myconf} --with-berkeley-db=./bdb"
369 else
370 myconf="${myconf} --without-berkeley-db"
371 fi
372 fi 344 fi
373 345
374 if mysql_version_is_at_least "4.1.3" ; then 346 if mysql_version_is_at_least "4.1.3" ; then
375 myconf="${myconf} --with-geometry" 347 myconf="${myconf} --with-geometry"
376 myconf="${myconf} $(use_with cluster ndbcluster)" 348 myconf="${myconf} $(use_with cluster ndbcluster)"
377 fi 349 fi
378 350
379 if mysql_version_is_at_least "4.1.3" && useq "extraengine" ; then 351 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
380 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 352 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
381 myconf="${myconf} --with-archive-storage-engine" 353 myconf="${myconf} --with-archive-storage-engine"
382 354
383 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 355 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
384 myconf="${myconf} --with-csv-storage-engine" 356 myconf="${myconf} --with-csv-storage-engine"
395 myconf="${myconf} --with-federated-storage-engine" 367 myconf="${myconf} --with-federated-storage-engine"
396 fi 368 fi
397 fi 369 fi
398 370
399 mysql_version_is_at_least "5.0.18" \ 371 mysql_version_is_at_least "5.0.18" \
400 && useq "max-idx-128" \ 372 && use max-idx-128 \
401 && myconf="${myconf} --with-max-indexes=128" 373 && myconf="${myconf} --with-max-indexes=128"
402} 374}
403 375
404configure_51() { 376configure_51() {
405 # TODO: !!!! readd --without-readline 377 # TODO: !!!! readd --without-readline
410 myconf="${myconf} --with-geometry" 382 myconf="${myconf} --with-geometry"
411 myconf="${myconf} --with-readline" 383 myconf="${myconf} --with-readline"
412 myconf="${myconf} --with-row-based-replication" 384 myconf="${myconf} --with-row-based-replication"
413 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 385 myconf="${myconf} --with-zlib=/usr/$(get_libdir)"
414 myconf="${myconf} --without-pstack" 386 myconf="${myconf} --without-pstack"
415 useq "max-idx-128" && myconf="${myconf} --with-max-indexes=128" 387 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
416 388
417 # 5.1 introduces a new way to manage storage engines (plugins) 389 # 5.1 introduces a new way to manage storage engines (plugins)
418 # like configuration=none 390 # like configuration=none
419 local plugins="csv,myisam,myisammrg,heap" 391 local plugins="csv,myisam,myisammrg,heap"
420 if useq "extraengine" ; then 392 if use extraengine ; then
421 # like configuration=max-no-ndb, archive and example removed in 5.1.11 393 # like configuration=max-no-ndb, archive and example removed in 5.1.11
422 plugins="${plugins},archive,blackhole,example,federated,partition" 394 plugins="${plugins},archive,blackhole,example,federated,partition"
423 395
424 elog "Before using the Federated storage engine, please be sure to read" 396 elog "Before using the Federated storage engine, please be sure to read"
425 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 397 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
426 fi 398 fi
427 399
428 if useq "innodb" ; then 400 if use innodb ; then
429 plugins="${plugins},innobase" 401 plugins="${plugins},innobase"
430 fi 402 fi
431 403
432 # like configuration=max-no-ndb 404 # like configuration=max-no-ndb
433 if useq "cluster" ; then 405 if use cluster ; then
434 plugins="${plugins},ndbcluster" 406 plugins="${plugins},ndbcluster"
435 myconf="${myconf} --with-ndb-binlog" 407 myconf="${myconf} --with-ndb-binlog"
436 fi 408 fi
437 409
438 if mysql_version_is_at_least "5.2" ; then 410 if mysql_version_is_at_least "5.2" ; then
448 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 420 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
449 421
450 einfo "Reconfiguring dir '${PWD}'" 422 einfo "Reconfiguring dir '${PWD}'"
451 AT_GNUCONF_UPDATE="yes" eautoreconf 423 AT_GNUCONF_UPDATE="yes" eautoreconf
452 424
453 local myconf 425 local myconf=""
454 myconf="${myconf} --with-mysql=${S}"
455 mkdir -p ${T}/lib
456 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}" 426 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
457 useq "debug" && myconf="${myconf} --with-debug=full" 427 use debug && myconf="${myconf} --with-debug=full"
458 # TODO is safe/needed to use econf here ? 428 # TODO: is it safe/needed to use econf here ?
459 ./configure ${myconf} || die "problem configuring pbxt storage engine" 429 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
460 # TODO is safe/needed to use emake here ? 430 # TODO: is it safe/needed to use emake here ?
461 make || die "problem making pbxt storage engine (${myconf})" 431 make || die "Problem making PBXT storage engine (${myconf})"
462 432
463 popd 433 popd
464 # TODO: modify test suite 434 # TODO: modify test suite for PBXT
465} 435}
466 436
467pbxt_src_install() { 437pbxt_src_install() {
468 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 438 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
469 make install || die "failed pbxt install" 439 make install || die "Failed to install PBXT"
470 popd 440 popd
471} 441}
472 442
473# 443#
474# EBUILD FUNCTIONS 444# EBUILD FUNCTIONS
477mysql_pkg_setup() { 447mysql_pkg_setup() {
478 enewgroup mysql 60 || die "problem adding 'mysql' group" 448 enewgroup mysql 60 || die "problem adding 'mysql' group"
479 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 449 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
480 450
481 # Check for USE flag problems in pkg_setup 451 # Check for USE flag problems in pkg_setup
482 if useq "static" && useq "ssl" ; then 452 if use static && use ssl ; then
483 eerror "MySQL does not support being built statically with SSL support enabled!" 453 eerror "MySQL does not support being built statically with SSL support enabled!"
484 die "MySQL does not support being built statically with SSL support enabled!" 454 die "MySQL does not support being built statically with SSL support enabled!"
485 fi 455 fi
486 456
487 if ! mysql_version_is_at_least "5.0" \ 457 if ! mysql_version_is_at_least "5.0" \
488 && useq "raid" \ 458 && use raid \
489 && useq "static" ; then 459 && use static ; then
490 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically" 460 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
491 eerror "with RAID support enabled." 461 eerror "with RAID support enabled."
492 die "USE flags 'raid' and 'static' conflict!" 462 die "USE flags 'raid' and 'static' conflict!"
493 fi 463 fi
494 464
495 if mysql_version_is_at_least "4.1.3" \ 465 if mysql_version_is_at_least "4.1.3" \
496 && ( useq "cluster" || useq "extraengine" ) \ 466 && ( use cluster || use extraengine ) \
497 && useq "minimal" ; then 467 && use minimal ; then
498 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 468 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
499 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 469 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
500 fi 470 fi
501 471
502 mysql_check_version_range "4.0 to 5.0.99.99" \ 472 mysql_check_version_range "4.0 to 5.0.99.99" \
503 && useq "berkdb" \ 473 && use berkdb \
504 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 474 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
505} 475}
506 476
507mysql_src_unpack() { 477mysql_src_unpack() {
508 # Initialize the proper variables first 478 # Initialize the proper variables first
510 480
511 unpack ${A} 481 unpack ${A}
512 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 482 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
513 if mysql_check_version_range "5.1 to 5.1.99" ; then 483 if mysql_check_version_range "5.1 to 5.1.99" ; then
514 bitkeeper_fetch "mysql-5.1-ndb" 484 bitkeeper_fetch "mysql-5.1-ndb"
515 elif mysql_check_version_range "5.2.0 to 5.2.99" ; then 485 elif mysql_check_version_range "5.2 to 5.2.99" ; then
516 bitkeeper_fetch "mysql-5.2-falcon" 486 bitkeeper_fetch "mysql-5.2-falcon"
517 else 487 else
518 bitkeeper_fetch 488 bitkeeper_fetch
519 fi 489 fi
520 cd "${S}" 490 cd "${S}"
521 einfo "running upstream autorun on bk sources" 491 einfo "Running upstream autorun over BK sources ..."
522 BUILD/autorun.sh 492 BUILD/autorun.sh
523 else 493 else
524 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 494 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
525 cd "${S}" 495 cd "${S}"
526 fi 496 fi
527 497
528 # Apply the patches for this MySQL version 498 # Apply the patches for this MySQL version
529 EPATCH_SUFFIX="patch" 499 EPATCH_SUFFIX="patch"
530 mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory" 500 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
531 mysql_mv_patches 501 mysql_mv_patches
532 epatch || die "failed to apply all patches" 502 epatch
533 503
534 # Additional checks, remove bundled zlib 504 # Additional checks, remove bundled zlib
535 rm -f "${S}/zlib/"*.[ch] 505 rm -f "${S}/zlib/"*.[ch]
536 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 506 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
537 rm -f "scripts/mysqlbug" 507 rm -f "scripts/mysqlbug"
552 522
553 local rebuilddirlist d 523 local rebuilddirlist d
554 524
555 if mysql_version_is_at_least "5.1.12" ; then 525 if mysql_version_is_at_least "5.1.12" ; then
556 rebuilddirlist="." 526 rebuilddirlist="."
557 # TODO IMPO! Check this with a cmake expert 527 # TODO: check this with a cmake expert
558 useq "innodb" \ 528 use innodb \
559 && cmake \ 529 && cmake \
560 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 530 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
561 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 531 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \
562 "storage/innobase" 532 "storage/innobase"
563 else 533 else
564 rebuilddirlist=". innobase" 534 rebuilddirlist=". innobase"
565 fi 535 fi
566 536
570 AT_GNUCONF_UPDATE="yes" eautoreconf 540 AT_GNUCONF_UPDATE="yes" eautoreconf
571 popd &>/dev/null 541 popd &>/dev/null
572 done 542 done
573 543
574 if mysql_check_version_range "4.1 to 5.0.99.99" \ 544 if mysql_check_version_range "4.1 to 5.0.99.99" \
575 && useq "berkdb" ; then 545 && use berkdb ; then
576 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 546 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
547 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
548 || die "Could not copy libtool.m4 to bdb/dist/"
577 pushd "bdb/dist" \ 549 pushd "bdb/dist" &>/dev/null
578 && sh s_all \ 550 sh s_all \
579 || die "Failed bdb reconfigure" \ 551 || die "Failed bdb reconfigure"
580 &>/dev/null
581 popd &>/dev/null 552 popd &>/dev/null
582 fi 553 fi
583} 554}
584 555
585mysql_src_compile() { 556mysql_src_compile() {
587 mysql_init_vars 558 mysql_init_vars
588 559
589 # $myconf is modified by the configure_* functions 560 # $myconf is modified by the configure_* functions
590 local myconf="" 561 local myconf=""
591 562
592 if useq "minimal" ; then 563 if use minimal ; then
593 configure_minimal 564 configure_minimal
594 else 565 else
595 configure_common 566 configure_common
596 if mysql_version_is_at_least "5.1.10" ; then 567 if mysql_version_is_at_least "5.1.10" ; then
597 configure_51 568 configure_51
611 mysql_version_is_at_least "5.0" \ 582 mysql_version_is_at_least "5.0" \
612 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 583 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
613 export CXXFLAGS 584 export CXXFLAGS
614 585
615 econf \ 586 econf \
616 --program-suffix="${MY_SUFFIX}" \
617 --libexecdir="/usr/sbin" \ 587 --libexecdir="/usr/sbin" \
618 --sysconfdir="${MY_SYSCONFDIR}" \ 588 --sysconfdir="${MY_SYSCONFDIR}" \
619 --localstatedir="${MY_LOCALSTATEDIR}" \ 589 --localstatedir="${MY_LOCALSTATEDIR}" \
620 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 590 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
621 --libdir="${MY_LIBDIR}" \ 591 --libdir="${MY_LIBDIR}" \
632 | xargs -0 -n100 sed -i \ 602 | xargs -0 -n100 sed -i \
633 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 603 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
634 604
635 emake || die "emake failed" 605 emake || die "emake failed"
636 606
637 mysql_version_is_at_least "5.1.1" && useq "pbxt" && pbxt_src_compile 607 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
638} 608}
639 609
640mysql_src_install() { 610mysql_src_install() {
641 # Make sure the vars are correctly initialized 611 # Make sure the vars are correctly initialized
642 mysql_init_vars 612 mysql_init_vars
643 613
644 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die 614 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
645 615
646 mysql_version_is_at_least "5.1.12" && useq "pbxt" && pbxt_src_install 616 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
647 617
648 insinto "${MY_INCLUDEDIR}" 618 insinto "${MY_INCLUDEDIR}"
649 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h 619 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
650 620
651 # Convenience links 621 # Convenience links
652 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}" 622 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
653 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}" 623 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
654 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}" 624 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
655 625
656 # Various junk (my-*.cnf moved elsewhere) 626 # Various junk (my-*.cnf moved elsewhere)
657 rm -Rf "${D}/usr/share/info" 627 rm -Rf "${D}/usr/share/info"
658 for removeme in "mysql-log-rotate" mysql.server* \ 628 for removeme in "mysql-log-rotate" mysql.server* \
659 binary-configure* my-*.cnf mi_test_all* 629 binary-configure* my-*.cnf mi_test_all*
660 do 630 do
661 rm -f "${D}"/usr/share/mysql/${removeme} 631 rm -f "${D}"/usr/share/mysql/${removeme}
662 done 632 done
663 633
664 # TODO change at Makefile-am level
665 if [[ ${PN} == "mysql-slotted" ]] ; then
666 for moveme in "mysql_fix_privilege_tables.sql" \
667 "fill_help_tables.sql" "ndb-config-2-node.ini"
668 do
669 mv -f "${D}/usr/share/mysql/${moveme}" "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
670 done
671 fi
672
673 # clean up stuff for a minimal build 634 # Clean up stuff for a minimal build
674 if useq "minimal" ; then 635 if use minimal ; then
675 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 636 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
676 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} 637 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}
677 rm -f "${D}/usr/sbin/mysqld" 638 rm -f "${D}/usr/sbin/mysqld"
678 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 639 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
679 fi 640 fi
680 641
681 if [[ ${PN} == "mysql-slotted" ]] ; then
682 local notcatched=$(ls "${D}/usr/share/mysql"/*)
683 if [[ -n "${notcatched}" ]] ; then
684 ewarn "QA notice"
685 ewarn "${notcatched} files in /usr/share/mysql"
686 ewarn "bug mysql-herd to manage them"
687 fi
688 rm -Rf "${D}/usr/share/mysql"
689 fi
690
691 # Configuration stuff 642 # Configuration stuff
692 if mysql_version_is_at_least "4.1" ; then 643 if mysql_version_is_at_least "4.1" ; then
693 mysql_mycnf_version="4.1" 644 mysql_mycnf_version="4.1"
694 else 645 else
695 mysql_mycnf_version="4.0" 646 mysql_mycnf_version="4.0"
696 fi 647 fi
697 insinto "${MY_SYSCONFDIR}" 648 insinto "${MY_SYSCONFDIR}"
698 doins scripts/mysqlaccess.conf 649 doins scripts/mysqlaccess.conf
699 sed -e "s!@MY_SUFFIX@!${MY_SUFFIX}!g" \
700 -e "s!@DATADIR@!${DATADIR}!g" \ 650 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
701 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 651 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
702 > "${TMPDIR}/my.cnf.ok" 652 > "${TMPDIR}/my.cnf.ok"
703 if mysql_version_is_at_least "4.1" && useq "latin1" ; then 653 if mysql_version_is_at_least "4.1" && use latin1 ; then
704 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 654 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
705 fi 655 fi
706 newins "${TMPDIR}/my.cnf.ok" my.cnf 656 newins "${TMPDIR}/my.cnf.ok" my.cnf
707 657
708 # Minimal builds don't have the MySQL server 658 # Minimal builds don't have the MySQL server
709 if ! useq "minimal" ; then 659 if ! use minimal ; then
710 # Empty directories ... 660 # Empty directories ...
711 diropts "-m0750" 661 diropts "-m0750"
712 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 662 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
713 dodir "${DATADIR}" 663 dodir "${MY_DATADIR}"
714 keepdir "${DATADIR}" 664 keepdir "${MY_DATADIR}"
715 chown -R mysql:mysql "${D}/${DATADIR}" 665 chown -R mysql:mysql "${D}/${MY_DATADIR}"
716 fi 666 fi
717 667
718 diropts "-m0755" 668 diropts "-m0755"
719 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 669 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
720 dodir "${folder}" 670 dodir "${folder}"
723 done 673 done
724 fi 674 fi
725 675
726 # Docs 676 # Docs
727 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 677 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
678 doinfo ${S}/Docs/mysql.info
728 679
729 # Minimal builds don't have the MySQL server 680 # Minimal builds don't have the MySQL server
730 if ! useq "minimal" ; then 681 if ! use minimal ; then
731 docinto "support-files" 682 docinto "support-files"
732 for script in \ 683 for script in \
733 support-files/my-*.cnf \ 684 support-files/my-*.cnf \
734 support-files/magic \ 685 support-files/magic \
735 support-files/ndb-config-2-node.ini 686 support-files/ndb-config-2-node.ini
739 690
740 docinto "scripts" 691 docinto "scripts"
741 for script in scripts/mysql* ; do 692 for script in scripts/mysql* ; do
742 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 693 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
743 done 694 done
744 fi
745 695
746 if [[ ${PN} == "mysql-slotted" ]] ; then
747 # MOVED HERE DUE TO BUG #121445
748 # create a list of files, to be used
749 # by external utilities
750 mkdir -p "${D}/var/lib/eselect/mysql/"
751 local filelist="${D}/var/lib/eselect/mysql/mysql${MY_SUFFIX}.filelist"
752 pushd "${D}/" &>/dev/null
753 find usr/bin/ usr/sbin/ \
754 -type f -name "*${MY_SUFFIX}*" \
755 -and -not -name "mysql_config${MY_SUFFIX}" \
756 > "${filelist}"
757 find usr/share/man \
758 -type f -name "*${MY_SUFFIX}*" \
759 | sed -e 's/$/.gz/' \
760 >> "${filelist}"
761 echo "${MY_SYSCONFDIR#"/"}" >> "${filelist}"
762 echo "${MY_LIBDIR#"/"}" >> "${filelist}"
763 echo "${MY_SHAREDSTATEDIR#"/"}" >> "${filelist}"
764 popd &>/dev/null
765 fi 696 fi
766 697
767 mysql_lib_symlinks "${D}" 698 mysql_lib_symlinks "${D}"
768} 699}
769 700
775mysql_pkg_postinst() { 706mysql_pkg_postinst() {
776 # Make sure the vars are correctly initialized 707 # Make sure the vars are correctly initialized
777 mysql_init_vars 708 mysql_init_vars
778 709
779 # Check FEATURES="collision-protect" before removing this 710 # Check FEATURES="collision-protect" before removing this
780 [[ -d "${ROOT}/var/log/mysql" ]] \
781 || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" 711 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
782 712
783 # Secure the logfiles 713 # Secure the logfiles
784 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 714 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
785 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 715 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
786 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 716 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
787 717
788 # Minimal builds don't have the MySQL server 718 # Minimal builds don't have the MySQL server
789 if ! useq "minimal" ; then 719 if ! use minimal ; then
790 docinto "support-files" 720 docinto "support-files"
791 for script in \ 721 for script in \
792 support-files/my-*.cnf \ 722 support-files/my-*.cnf \
793 support-files/magic \ 723 support-files/magic \
794 support-files/ndb-config-2-node.ini 724 support-files/ndb-config-2-node.ini
798 728
799 docinto "scripts" 729 docinto "scripts"
800 for script in scripts/mysql* ; do 730 for script in scripts/mysql* ; do
801 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 731 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
802 done 732 done
803 fi
804 733
805 einfo "you may want to read slotting upgrade documents in the overlay" 734 einfo
806 if useq "pbxt" && mysql_version_is_at_least "5.1" ; then 735 elog "You might want to run:"
807 # TODO tell it better ;-) 736 elog "\"emerge --config =${CATEGORY}/${PF}\""
737 elog "if this is a new install."
738 einfo
739 fi
740
741 if mysql_version_is_at_least "5.1.12" && use pbxt ; then
742 # TODO: explain it better
808 einfo "mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 743 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
809 einfo "CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 744 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
810 einfo "if, after that you cannot start the mysql server" 745 elog "if, after that, you cannot start the MySQL server,"
811 einfo "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 746 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
812 einfo "use the mysql upgrade script to restore the table" 747 elog "use the MySQL upgrade script to restore the table"
813 einfo " or " 748 elog "or execute the following SQL command:"
814 einfo "CREATE TABLE IF NOT EXISTS plugin (" 749 elog " CREATE TABLE IF NOT EXISTS plugin ("
815 einfo " name char(64) binary DEFAULT '' NOT NULL," 750 elog " name char(64) binary DEFAULT '' NOT NULL,"
816 einfo " dl char(128) DEFAULT '' NOT NULL," 751 elog " dl char(128) DEFAULT '' NOT NULL,"
817 einfo " PRIMARY KEY (name)" 752 elog " PRIMARY KEY (name)"
818 einfo ") CHARACTER SET utf8 COLLATE utf8_bin;" 753 elog " ) CHARACTER SET utf8 COLLATE utf8_bin;"
819 fi 754 fi
755
820 mysql_check_version_range "4.0 to 5.0.99.99" \ 756 mysql_check_version_range "4.0 to 5.0.99.99" \
821 && useq "berkdb" \ 757 && use berkdb \
822 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 758 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
823} 759}
824 760
825mysql_pkg_config() { 761mysql_pkg_config() {
826 # Make sure the vars are correctly initialized 762 # Make sure the vars are correctly initialized
827 mysql_init_vars 763 mysql_init_vars
828 764
829 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 765 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
830 766
831 if built_with_use ${CATEGORY}/${PN} minimal ; then 767 if built_with_use ${CATEGORY}/${PN} minimal ; then
832 die "Minimal builds do NOT include the MySQL server" 768 die "Minimal builds do NOT include the MySQL server"
833 fi 769 fi
834 770
835 local pwd1="a" 771 local pwd1="a"
836 local pwd2="b" 772 local pwd2="b"
837 local maxtry=5 773 local maxtry=5
838 774
839 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 775 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
840 ewarn "You have already a MySQL database in place." 776 ewarn "You have already a MySQL database in place."
841 ewarn "(${ROOT}/${DATADIR}/*)" 777 ewarn "(${ROOT}/${MY_DATADIR}/*)"
842 ewarn "Please rename or delete it if you wish to replace it." 778 ewarn "Please rename or delete it if you wish to replace it."
843 die "MySQL database already exists!" 779 die "MySQL database already exists!"
844 fi 780 fi
845 781
846 einfo "Creating the mysql database and setting proper" 782 einfo "Creating the mysql database and setting proper"
867 help_tables="${TMPDIR}/fill_help_tables.sql" 803 help_tables="${TMPDIR}/fill_help_tables.sql"
868 804
869 pushd "${TMPDIR}" &>/dev/null 805 pushd "${TMPDIR}" &>/dev/null
870 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 806 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR"
871 popd &>/dev/null 807 popd &>/dev/null
872 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 808 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
873 || die "MySQL databases not installed" 809 || die "MySQL databases not installed"
874 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 810 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null
875 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 811 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null
876 812
877 if mysql_version_is_at_least "4.1.3" ; then 813 if mysql_version_is_at_least "4.1.3" ; then
878 options="--skip-ndbcluster" 814 options="--skip-ndbcluster"
879 815
880 # Filling timezones, see 816 # Filling timezones, see
891 local mysqld="${ROOT}/usr/sbin/mysqld \ 827 local mysqld="${ROOT}/usr/sbin/mysqld \
892 ${options} \ 828 ${options} \
893 --user=mysql \ 829 --user=mysql \
894 --skip-grant-tables \ 830 --skip-grant-tables \
895 --basedir=${ROOT}/usr \ 831 --basedir=${ROOT}/usr \
896 --datadir=${ROOT}/${DATADIR} \ 832 --datadir=${ROOT}/${MY_DATADIR} \
897 --skip-innodb \ 833 --skip-innodb \
898 --skip-bdb \ 834 --skip-bdb \
899 --skip-networking \ 835 --skip-networking \
900 --max_allowed_packet=8M \ 836 --max_allowed_packet=8M \
901 --net_buffer_length=16K \ 837 --net_buffer_length=16K \
931 wait %1 867 wait %1
932 einfo "Done" 868 einfo "Done"
933} 869}
934 870
935mysql_pkg_postrm() { 871mysql_pkg_postrm() {
936 if [[ ${PN} == "mysql-slotted" ]] ; then
937 mysql_lib_symlinks 872 : # mysql_lib_symlinks "${D}"
938 mysql_clients_link_to_best_version
939 fi
940} 873}

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.78

  ViewVC Help
Powered by ViewVC 1.1.20