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

Diff of /eclass/mysql.eclass

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

Revision 1.61 Revision 1.76
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.61 2007/01/05 22:41:49 vivo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.76 2007/05/09 16:25:33 cardoe 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.2.0" ; then 326 if mysql_version_is_at_least "5.1.11" ; then
351 myconf="${myconf} --with-ssl" 327 myconf="${myconf} $(use_with ssl)"
352 else 328 else
353 myconf="${myconf} --with-openssl" 329 myconf="${myconf} $(use_with ssl openssl)"
354 fi 330 fi
355 else
356 myconf="${myconf} --without-openssl"
357 fi
358 331
332 if use berkdb ; then
359 # The following fix is due to a bug with bdb on SPARC's. See: 333 # The following fix is due to a bug with bdb on SPARC's. See:
360 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 334 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
361 # It comes down to non-64-bit safety problems. 335 # It comes down to non-64-bit safety problems.
362 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then 336 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
363 elog "Berkeley DB support was disabled due to incompatible arch" 337 elog "Berkeley DB support was disabled due to compatiblity issues on this arch"
338 myconf="${myconf} --without-berkeley-db"
339 else
340 myconf="${myconf} --with-berkeley-db=./bdb"
341 fi
342 else
364 myconf="${myconf} --without-berkeley-db" 343 myconf="${myconf} --without-berkeley-db"
365 else
366 if useq "berkdb" ; then
367 myconf="${myconf} --with-berkeley-db=./bdb"
368 else
369 myconf="${myconf} --without-berkeley-db"
370 fi
371 fi 344 fi
372 345
373 if mysql_version_is_at_least "4.1.3" ; then 346 if mysql_version_is_at_least "4.1.3" ; then
374 myconf="${myconf} --with-geometry" 347 myconf="${myconf} --with-geometry"
375 myconf="${myconf} $(use_with cluster ndbcluster)" 348 myconf="${myconf} $(use_with cluster ndbcluster)"
376 fi 349 fi
377 350
378 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
379 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 352 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
380 myconf="${myconf} --with-archive-storage-engine" 353 myconf="${myconf} --with-archive-storage-engine"
381 354
382 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 355 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
383 myconf="${myconf} --with-csv-storage-engine" 356 myconf="${myconf} --with-csv-storage-engine"
… …
394 myconf="${myconf} --with-federated-storage-engine" 367 myconf="${myconf} --with-federated-storage-engine"
395 fi 368 fi
396 fi 369 fi
397 370
398 mysql_version_is_at_least "5.0.18" \ 371 mysql_version_is_at_least "5.0.18" \
399 && useq "max-idx-128" \ 372 && use max-idx-128 \
400 && myconf="${myconf} --with-max-indexes=128" 373 && myconf="${myconf} --with-max-indexes=128"
401} 374}
402 375
403configure_51() { 376configure_51() {
404 # TODO: !!!! readd --without-readline 377 # TODO: !!!! readd --without-readline
… …
409 myconf="${myconf} --with-geometry" 382 myconf="${myconf} --with-geometry"
410 myconf="${myconf} --with-readline" 383 myconf="${myconf} --with-readline"
411 myconf="${myconf} --with-row-based-replication" 384 myconf="${myconf} --with-row-based-replication"
412 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 385 myconf="${myconf} --with-zlib=/usr/$(get_libdir)"
413 myconf="${myconf} --without-pstack" 386 myconf="${myconf} --without-pstack"
414 useq "max-idx-128" && myconf="${myconf} --with-max-indexes=128" 387 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
415 388
416 # 5.1 introduces a new way to manage storage engines (plugins) 389 # 5.1 introduces a new way to manage storage engines (plugins)
417 # like configuration=none 390 # like configuration=none
418 local plugins="csv,myisam,myisammrg,heap" 391 local plugins="csv,myisam,myisammrg,heap"
419 if useq "extraengine" ; then 392 if use extraengine ; then
420 # 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
421 plugins="${plugins},archive,blackhole,example,federated,partition" 394 plugins="${plugins},archive,blackhole,example,federated,partition"
422 395
423 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"
424 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"
425 fi 398 fi
426 399
427 if useq "innodb" ; then 400 if use innodb ; then
428 plugins="${plugins},innobase" 401 plugins="${plugins},innobase"
429 fi 402 fi
430 403
431 # like configuration=max-no-ndb 404 # like configuration=max-no-ndb
432 if useq "cluster" ; then 405 if use cluster ; then
433 plugins="${plugins},ndbcluster" 406 plugins="${plugins},ndbcluster"
434 myconf="${myconf} --with-ndb-binlog" 407 myconf="${myconf} --with-ndb-binlog"
435 fi 408 fi
436 409
437 if mysql_version_is_at_least "5.2" ; then 410 if mysql_version_is_at_least "5.2" ; then
… …
447 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 420 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
448 421
449 einfo "Reconfiguring dir '${PWD}'" 422 einfo "Reconfiguring dir '${PWD}'"
450 AT_GNUCONF_UPDATE="yes" eautoreconf 423 AT_GNUCONF_UPDATE="yes" eautoreconf
451 424
452 local myconf 425 local myconf=""
453 myconf="${myconf} --with-mysql=${S}"
454 mkdir -p ${T}/lib
455 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}" 426 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
456 useq "debug" && myconf="${myconf} --with-debug=full" 427 use debug && myconf="${myconf} --with-debug=full"
457 # TODO is safe/needed to use econf here ? 428 # TODO: is it safe/needed to use econf here ?
458 ./configure ${myconf} || die "problem configuring pbxt storage engine" 429 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
459 # TODO is safe/needed to use emake here ? 430 # TODO: is it safe/needed to use emake here ?
460 make || die "problem making pbxt storage engine (${myconf})" 431 make || die "Problem making PBXT storage engine (${myconf})"
461 432
462 popd 433 popd
463 # TODO: modify test suite 434 # TODO: modify test suite for PBXT
464} 435}
465 436
466pbxt_src_install() { 437pbxt_src_install() {
467 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 438 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
468 make install || die "failed pbxt install" 439 make install || die "Failed to install PBXT"
469 popd 440 popd
470} 441}
471 442
472# 443#
473# EBUILD FUNCTIONS 444# EBUILD FUNCTIONS
… …
476mysql_pkg_setup() { 447mysql_pkg_setup() {
477 enewgroup mysql 60 || die "problem adding 'mysql' group" 448 enewgroup mysql 60 || die "problem adding 'mysql' group"
478 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"
479 450
480 # Check for USE flag problems in pkg_setup 451 # Check for USE flag problems in pkg_setup
481 if useq "static" && useq "ssl" ; then 452 if use static && use ssl ; then
482 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!"
483 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!"
484 fi 455 fi
485 456
486 if ! mysql_version_is_at_least "5.0" \ 457 if ! mysql_version_is_at_least "5.0" \
487 && useq "raid" \ 458 && use raid \
488 && useq "static" ; then 459 && use static ; then
489 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"
490 eerror "with RAID support enabled." 461 eerror "with RAID support enabled."
491 die "USE flags 'raid' and 'static' conflict!" 462 die "USE flags 'raid' and 'static' conflict!"
492 fi 463 fi
493 464
494 if mysql_version_is_at_least "4.1.3" \ 465 if mysql_version_is_at_least "4.1.3" \
495 && ( useq "cluster" || useq "extraengine" ) \ 466 && ( use cluster || use extraengine ) \
496 && useq "minimal" ; then 467 && use minimal ; then
497 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 468 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
498 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 469 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
499 fi 470 fi
500 471
501 mysql_check_version_range "4.0 to 5.0.99.99" \ 472 mysql_check_version_range "4.0 to 5.0.99.99" \
502 && useq "berkdb" \ 473 && use berkdb \
503 && 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!"
504} 475}
505 476
506mysql_src_unpack() { 477mysql_src_unpack() {
507 # Initialize the proper variables first 478 # Initialize the proper variables first
… …
509 480
510 unpack ${A} 481 unpack ${A}
511 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 482 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
512 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
513 bitkeeper_fetch "mysql-5.1-ndb" 484 bitkeeper_fetch "mysql-5.1-ndb"
514 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
515 bitkeeper_fetch "mysql-5.2-falcon" 486 bitkeeper_fetch "mysql-5.2-falcon"
516 else 487 else
517 bitkeeper_fetch 488 bitkeeper_fetch
518 fi 489 fi
519 cd "${S}" 490 cd "${S}"
520 einfo "running upstream autorun on bk sources" 491 einfo "Running upstream autorun over BK sources ..."
521 BUILD/autorun.sh 492 BUILD/autorun.sh
522 else 493 else
523 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 494 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
524 cd "${S}" 495 cd "${S}"
525 fi 496 fi
526 497
527 # Apply the patches for this MySQL version 498 # Apply the patches for this MySQL version
528 EPATCH_SUFFIX="patch" 499 EPATCH_SUFFIX="patch"
529 mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory" 500 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
530 mysql_mv_patches 501 mysql_mv_patches
531 epatch || die "failed to apply all patches" 502 epatch
532 503
533 # Additional checks, remove bundled zlib 504 # Additional checks, remove bundled zlib
534 rm -f "${S}/zlib/"*.[ch] 505 rm -f "${S}/zlib/"*.[ch]
535 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"
536 rm -f "scripts/mysqlbug" 507 rm -f "scripts/mysqlbug"
… …
551 522
552 local rebuilddirlist d 523 local rebuilddirlist d
553 524
554 if mysql_version_is_at_least "5.1.12" ; then 525 if mysql_version_is_at_least "5.1.12" ; then
555 rebuilddirlist="." 526 rebuilddirlist="."
556 # TODO IMPO! Check this with a cmake expert 527 # TODO: check this with a cmake expert
557 useq "innodb" \ 528 use innodb \
558 && cmake \ 529 && cmake \
559 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 530 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
560 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 531 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \
561 "storage/innobase" 532 "storage/innobase"
562 else 533 else
563 rebuilddirlist=". innobase" 534 rebuilddirlist=". innobase"
564 fi 535 fi
565 536
… …
569 AT_GNUCONF_UPDATE="yes" eautoreconf 540 AT_GNUCONF_UPDATE="yes" eautoreconf
570 popd &>/dev/null 541 popd &>/dev/null
571 done 542 done
572 543
573 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" \
574 && useq "berkdb" ; then 545 && use berkdb ; then
575 [[ -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/"
576 pushd "bdb/dist" \ 549 pushd "bdb/dist" &>/dev/null
577 && sh s_all \ 550 sh s_all \
578 || die "Failed bdb reconfigure" \ 551 || die "Failed bdb reconfigure"
579 &>/dev/null
580 popd &>/dev/null 552 popd &>/dev/null
581 fi 553 fi
582} 554}
583 555
584mysql_src_compile() { 556mysql_src_compile() {
… …
586 mysql_init_vars 558 mysql_init_vars
587 559
588 # $myconf is modified by the configure_* functions 560 # $myconf is modified by the configure_* functions
589 local myconf="" 561 local myconf=""
590 562
591 if useq "minimal" ; then 563 if use minimal ; then
592 configure_minimal 564 configure_minimal
593 else 565 else
594 configure_common 566 configure_common
595 if mysql_version_is_at_least "5.1.10" ; then 567 if mysql_version_is_at_least "5.1.10" ; then
596 configure_51 568 configure_51
… …
610 mysql_version_is_at_least "5.0" \ 582 mysql_version_is_at_least "5.0" \
611 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 583 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
612 export CXXFLAGS 584 export CXXFLAGS
613 585
614 econf \ 586 econf \
615 --program-suffix="${MY_SUFFIX}" \
616 --libexecdir="/usr/sbin" \ 587 --libexecdir="/usr/sbin" \
617 --sysconfdir="${MY_SYSCONFDIR}" \ 588 --sysconfdir="${MY_SYSCONFDIR}" \
618 --localstatedir="${MY_LOCALSTATEDIR}" \ 589 --localstatedir="${MY_LOCALSTATEDIR}" \
619 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 590 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
620 --libdir="${MY_LIBDIR}" \ 591 --libdir="${MY_LIBDIR}" \
… …
631 | xargs -0 -n100 sed -i \ 602 | xargs -0 -n100 sed -i \
632 -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)|'
633 604
634 emake || die "emake failed" 605 emake || die "emake failed"
635 606
636 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
637} 608}
638 609
639mysql_src_install() { 610mysql_src_install() {
640 # Make sure the vars are correctly initialized 611 # Make sure the vars are correctly initialized
641 mysql_init_vars 612 mysql_init_vars
642 613
643 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die 614 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
644 615
645 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
646 617
647 insinto "${MY_INCLUDEDIR}" 618 insinto "${MY_INCLUDEDIR}"
648 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h 619 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
649 620
650 # Convenience links 621 # Convenience links
651 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}" 622 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
652 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}" 623 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
653 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}" 624 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
654 625
655 # Various junk (my-*.cnf moved elsewhere) 626 # Various junk (my-*.cnf moved elsewhere)
656 rm -Rf "${D}/usr/share/info" 627 rm -Rf "${D}/usr/share/info"
657 for removeme in "mysql-log-rotate" mysql.server* \ 628 for removeme in "mysql-log-rotate" mysql.server* \
658 binary-configure* my-*.cnf mi_test_all* 629 binary-configure* my-*.cnf mi_test_all*
659 do 630 do
660 rm -f "${D}"/usr/share/mysql/${removeme} 631 rm -f "${D}"/usr/share/mysql/${removeme}
661 done 632 done
662 633
663 # TODO change at Makefile-am level
664 if [[ ${PN} == "mysql-slotted" ]] ; then
665 for moveme in "mysql_fix_privilege_tables.sql" \
666 "fill_help_tables.sql" "ndb-config-2-node.ini"
667 do
668 mv -f "${D}/usr/share/mysql/${moveme}" "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
669 done
670 fi
671
672 # clean up stuff for a minimal build 634 # Clean up stuff for a minimal build
673 if useq "minimal" ; then 635 if use minimal ; then
674 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 636 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
675 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}
676 rm -f "${D}/usr/sbin/mysqld" 638 rm -f "${D}/usr/sbin/mysqld"
677 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
678 fi 640 fi
679 641
680 if [[ ${PN} == "mysql-slotted" ]] ; then
681 local notcatched=$(ls "${D}/usr/share/mysql"/*)
682 if [[ -n "${notcatched}" ]] ; then
683 ewarn "QA notice"
684 ewarn "${notcatched} files in /usr/share/mysql"
685 ewarn "bug mysql-herd to manage them"
686 fi
687 rm -Rf "${D}/usr/share/mysql"
688 fi
689
690 # Configuration stuff 642 # Configuration stuff
691 if mysql_version_is_at_least "4.1" ; then 643 if mysql_version_is_at_least "4.1" ; then
692 mysql_mycnf_version="4.1" 644 mysql_mycnf_version="4.1"
693 else 645 else
694 mysql_mycnf_version="4.0" 646 mysql_mycnf_version="4.0"
695 fi 647 fi
696 insinto "${MY_SYSCONFDIR}" 648 insinto "${MY_SYSCONFDIR}"
697 doins scripts/mysqlaccess.conf 649 doins scripts/mysqlaccess.conf
698 sed -e "s!@MY_SUFFIX@!${MY_SUFFIX}!g" \
699 -e "s!@DATADIR@!${DATADIR}!g" \ 650 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
700 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 651 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
701 > "${TMPDIR}/my.cnf.ok" 652 > "${TMPDIR}/my.cnf.ok"
702 if mysql_version_is_at_least "4.1" && useq "latin1" ; then 653 if mysql_version_is_at_least "4.1" && use latin1 ; then
703 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 654 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
704 fi 655 fi
705 newins "${TMPDIR}/my.cnf.ok" my.cnf 656 newins "${TMPDIR}/my.cnf.ok" my.cnf
706 657
707 # Minimal builds don't have the MySQL server 658 # Minimal builds don't have the MySQL server
708 if ! useq "minimal" ; then 659 if ! use minimal ; then
709 # Empty directories ... 660 # Empty directories ...
710 diropts "-m0750" 661 diropts "-m0750"
711 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 662 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
712 dodir "${DATADIR}" 663 dodir "${MY_DATADIR}"
713 keepdir "${DATADIR}" 664 keepdir "${MY_DATADIR}"
714 chown -R mysql:mysql "${D}/${DATADIR}" 665 chown -R mysql:mysql "${D}/${MY_DATADIR}"
715 fi 666 fi
716 667
717 diropts "-m0755" 668 diropts "-m0755"
718 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 669 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
719 dodir "${folder}" 670 dodir "${folder}"
… …
724 675
725 # Docs 676 # Docs
726 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 677 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
727 678
728 # Minimal builds don't have the MySQL server 679 # Minimal builds don't have the MySQL server
729 if ! useq "minimal" ; then 680 if ! use minimal ; then
730 docinto "support-files" 681 docinto "support-files"
731 for script in \ 682 for script in \
732 support-files/my-*.cnf \ 683 support-files/my-*.cnf \
733 support-files/magic \ 684 support-files/magic \
734 support-files/ndb-config-2-node.ini 685 support-files/ndb-config-2-node.ini
… …
740 for script in scripts/mysql* ; do 691 for script in scripts/mysql* ; do
741 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 692 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
742 done 693 done
743 fi 694 fi
744 695
745 if [[ ${PN} == "mysql-slotted" ]] ; then
746 # MOVED HERE DUE TO BUG #121445
747 # create a list of files, to be used
748 # by external utilities
749 mkdir -p "${D}/var/lib/eselect/mysql/"
750 local filelist="${D}/var/lib/eselect/mysql/mysql${MY_SUFFIX}.filelist"
751 pushd "${D}/" &>/dev/null
752 find usr/bin/ usr/sbin/ \
753 -type f -name "*${MY_SUFFIX}*" \
754 -and -not -name "mysql_config${MY_SUFFIX}" \
755 > "${filelist}"
756 find usr/share/man \
757 -type f -name "*${MY_SUFFIX}*" \
758 | sed -e 's/$/.gz/' \
759 >> "${filelist}"
760 echo "${MY_SYSCONFDIR#"/"}" >> "${filelist}"
761 echo "${MY_LIBDIR#"/"}" >> "${filelist}"
762 echo "${MY_SHAREDSTATEDIR#"/"}" >> "${filelist}"
763 popd &>/dev/null
764 fi
765
766 mysql_lib_symlinks "${D}" 696 mysql_lib_symlinks "${D}"
767} 697}
768 698
769mysql_pkg_preinst() { 699mysql_pkg_preinst() {
770 enewgroup mysql 60 || die "problem adding 'mysql' group" 700 enewgroup mysql 60 || die "problem adding 'mysql' group"
… …
774mysql_pkg_postinst() { 704mysql_pkg_postinst() {
775 # Make sure the vars are correctly initialized 705 # Make sure the vars are correctly initialized
776 mysql_init_vars 706 mysql_init_vars
777 707
778 # Check FEATURES="collision-protect" before removing this 708 # Check FEATURES="collision-protect" before removing this
779 [[ -d "${ROOT}/var/log/mysql" ]] \
780 || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" 709 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
781 710
782 # Secure the logfiles 711 # Secure the logfiles
783 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 712 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
784 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 713 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
785 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 714 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
786 715
787 # Minimal builds don't have the MySQL server 716 # Minimal builds don't have the MySQL server
788 if ! useq "minimal" ; then 717 if ! use minimal ; then
789 docinto "support-files" 718 docinto "support-files"
790 for script in \ 719 for script in \
791 support-files/my-*.cnf \ 720 support-files/my-*.cnf \
792 support-files/magic \ 721 support-files/magic \
793 support-files/ndb-config-2-node.ini 722 support-files/ndb-config-2-node.ini
… …
797 726
798 docinto "scripts" 727 docinto "scripts"
799 for script in scripts/mysql* ; do 728 for script in scripts/mysql* ; do
800 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 729 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
801 done 730 done
802 fi
803 731
804 einfo "you may want to read slotting upgrade documents in the overlay" 732 einfo
805 if useq "pbxt" && mysql_version_is_at_least "5.1" ; then 733 elog "You might want to run:"
806 # TODO tell it better ;-) 734 elog "\"emerge --config =${CATEGORY}/${PF}\""
735 elog "if this is a new install."
736 einfo
737 fi
738
739 if mysql_version_is_at_least "5.1.12" && use pbxt ; then
740 # TODO: explain it better
807 einfo "mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 741 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
808 einfo "CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 742 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
809 einfo "if, after that you cannot start the mysql server" 743 elog "if, after that, you cannot start the MySQL server,"
810 einfo "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 744 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
811 einfo "use the mysql upgrade script to restore the table" 745 elog "use the MySQL upgrade script to restore the table"
812 einfo " or " 746 elog "or execute the following SQL command:"
813 einfo "CREATE TABLE IF NOT EXISTS plugin (" 747 elog " CREATE TABLE IF NOT EXISTS plugin ("
814 einfo " name char(64) binary DEFAULT '' NOT NULL," 748 elog " name char(64) binary DEFAULT '' NOT NULL,"
815 einfo " dl char(128) DEFAULT '' NOT NULL," 749 elog " dl char(128) DEFAULT '' NOT NULL,"
816 einfo " PRIMARY KEY (name)" 750 elog " PRIMARY KEY (name)"
817 einfo ") CHARACTER SET utf8 COLLATE utf8_bin;" 751 elog " ) CHARACTER SET utf8 COLLATE utf8_bin;"
818 fi 752 fi
753
819 mysql_check_version_range "4.0 to 5.0.99.99" \ 754 mysql_check_version_range "4.0 to 5.0.99.99" \
820 && useq "berkdb" \ 755 && use berkdb \
821 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 756 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
822} 757}
823 758
824mysql_pkg_config() { 759mysql_pkg_config() {
825 # Make sure the vars are correctly initialized 760 # Make sure the vars are correctly initialized
826 mysql_init_vars 761 mysql_init_vars
827 762
828 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 763 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
829 764
830 if built_with_use ${CATEGORY}/${PN} minimal ; then 765 if built_with_use ${CATEGORY}/${PN} minimal ; then
831 die "Minimal builds do NOT include the MySQL server" 766 die "Minimal builds do NOT include the MySQL server"
832 fi 767 fi
833 768
834 local pwd1="a" 769 local pwd1="a"
835 local pwd2="b" 770 local pwd2="b"
836 local maxtry=5 771 local maxtry=5
837 772
838 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 773 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
839 ewarn "You have already a MySQL database in place." 774 ewarn "You have already a MySQL database in place."
840 ewarn "(${ROOT}/${DATADIR}/*)" 775 ewarn "(${ROOT}/${MY_DATADIR}/*)"
841 ewarn "Please rename or delete it if you wish to replace it." 776 ewarn "Please rename or delete it if you wish to replace it."
842 die "MySQL database already exists!" 777 die "MySQL database already exists!"
843 fi 778 fi
844 779
845 einfo "Creating the mysql database and setting proper" 780 einfo "Creating the mysql database and setting proper"
… …
866 help_tables="${TMPDIR}/fill_help_tables.sql" 801 help_tables="${TMPDIR}/fill_help_tables.sql"
867 802
868 pushd "${TMPDIR}" &>/dev/null 803 pushd "${TMPDIR}" &>/dev/null
869 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 804 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR"
870 popd &>/dev/null 805 popd &>/dev/null
871 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 806 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
872 || die "MySQL databases not installed" 807 || die "MySQL databases not installed"
873 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 808 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null
874 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 809 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null
875 810
876 if mysql_version_is_at_least "4.1.3" ; then 811 if mysql_version_is_at_least "4.1.3" ; then
877 options="--skip-ndbcluster" 812 options="--skip-ndbcluster"
878 813
879 # Filling timezones, see 814 # Filling timezones, see
… …
890 local mysqld="${ROOT}/usr/sbin/mysqld \ 825 local mysqld="${ROOT}/usr/sbin/mysqld \
891 ${options} \ 826 ${options} \
892 --user=mysql \ 827 --user=mysql \
893 --skip-grant-tables \ 828 --skip-grant-tables \
894 --basedir=${ROOT}/usr \ 829 --basedir=${ROOT}/usr \
895 --datadir=${ROOT}/${DATADIR} \ 830 --datadir=${ROOT}/${MY_DATADIR} \
896 --skip-innodb \ 831 --skip-innodb \
897 --skip-bdb \ 832 --skip-bdb \
898 --skip-networking \ 833 --skip-networking \
899 --max_allowed_packet=8M \ 834 --max_allowed_packet=8M \
900 --net_buffer_length=16K \ 835 --net_buffer_length=16K \
… …
930 wait %1 865 wait %1
931 einfo "Done" 866 einfo "Done"
932} 867}
933 868
934mysql_pkg_postrm() { 869mysql_pkg_postrm() {
935 if [[ ${PN} == "mysql-slotted" ]] ; then
936 mysql_lib_symlinks 870 : # mysql_lib_symlinks "${D}"
937 mysql_clients_link_to_best_version
938 fi
939} 871}
Legend:
Removed from v.1.61  
changed lines
  Added in v.1.76
  ViewVC Help
Powered by ViewVC 1.1.13