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

Diff of /eclass/mysql.eclass

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

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

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20