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

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

  ViewVC Help
Powered by ViewVC 1.1.20