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

Diff of /eclass/mysql.eclass

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

Revision 1.61 Revision 1.90
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2007 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.61 2007/01/05 22:41:49 vivo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.90 2008/05/22 18:13:33 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 elog "Previous datadir found, it's YOUR job to change"
249 elog "ownership and take care of it" 246 elog "ownership and take care of it"
250 PREVIOUS_DATADIR="yes" 247 PREVIOUS_DATADIR="yes"
251 else 248 else
252 PREVIOUS_DATADIR="no" 249 PREVIOUS_DATADIR="no"
256 fi 253 fi
257 254
258 MY_SOURCEDIR=${SERVER_URI##*/} 255 MY_SOURCEDIR=${SERVER_URI##*/}
259 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} 256 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
260 257
261 export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR 258 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
262 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 259 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
263 export MY_INCLUDEDIR DATADIR MY_SOURCEDIR 260 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
264} 261}
265 262
266configure_minimal() { 263configure_minimal() {
267 # These are things we exclude from a minimal build, please 264 # These are things we exclude from a minimal build, please
268 # note that the server actually does get built and installed, 265 # note that the server actually does get built and installed,
269 # but we then delete it before packaging. 266 # but we then delete it before packaging.
270 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 267 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
271 268
272 for i in ${minimal_exclude_list} ; do 269 for i in ${minimal_exclude_list} ; do
273 myconf="${myconf} --without-${i}" 270 myconf="${myconf} --without-${i}"
274 done 271 done
275 myconf="${myconf} --with-extra-charsets=none" 272 myconf="${myconf} --with-extra-charsets=none"
276 myconf="${myconf} --enable-local-infile" 273 myconf="${myconf} --enable-local-infile"
277 274
278 if useq "static" ; then 275 if use static ; then
279 myconf="${myconf} --with-client-ldflags=-all-static" 276 myconf="${myconf} --with-client-ldflags=-all-static"
280 myconf="${myconf} --disable-shared" 277 myconf="${myconf} --disable-shared --with-pic"
281 else 278 else
282 myconf="${myconf} --enable-shared --enable-static" 279 myconf="${myconf} --enable-shared --enable-static"
283 fi 280 fi
284 281
285 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then 282 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
286 myconf="${myconf} --with-charset=utf8" 283 myconf="${myconf} --with-charset=utf8"
287 myconf="${myconf} --with-collation=utf8_general_ci" 284 myconf="${myconf} --with-collation=utf8_general_ci"
288 else 285 else
289 myconf="${myconf} --with-charset=latin1" 286 myconf="${myconf} --with-charset=latin1"
290 myconf="${myconf} --with-collation=latin1_swedish_ci" 287 myconf="${myconf} --with-collation=latin1_swedish_ci"
298 myconf="${myconf} --with-mysqld-user=mysql" 295 myconf="${myconf} --with-mysqld-user=mysql"
299 myconf="${myconf} --with-server" 296 myconf="${myconf} --with-server"
300 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 297 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
301 myconf="${myconf} --without-libwrap" 298 myconf="${myconf} --without-libwrap"
302 299
303 if useq "static" ; then 300 if use static ; then
304 myconf="${myconf} --with-mysqld-ldflags=-all-static" 301 myconf="${myconf} --with-mysqld-ldflags=-all-static"
305 myconf="${myconf} --with-client-ldflags=-all-static" 302 myconf="${myconf} --with-client-ldflags=-all-static"
306 myconf="${myconf} --disable-shared" 303 myconf="${myconf} --disable-shared --with-pic"
307 else 304 else
308 myconf="${myconf} --enable-shared --enable-static" 305 myconf="${myconf} --enable-shared --enable-static"
309 fi 306 fi
310 307
311 if useq "debug" ; then 308 if use debug ; then
312 myconf="${myconf} --with-debug=full" 309 myconf="${myconf} --with-debug=full"
313 else 310 else
314 myconf="${myconf} --without-debug" 311 myconf="${myconf} --without-debug"
315 mysql_version_is_at_least "4.1.3" \ 312 mysql_version_is_at_least "4.1.3" \
316 && useq "cluster" \ 313 && use cluster \
317 && myconf="${myconf} --without-ndb-debug" 314 && myconf="${myconf} --without-ndb-debug"
318 fi 315 fi
319 316
320 if mysql_version_is_at_least "4.1" && ! useq "latin1" ; then 317 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
321 myconf="${myconf} --with-charset=utf8" 318 myconf="${myconf} --with-charset=utf8"
322 myconf="${myconf} --with-collation=utf8_general_ci" 319 myconf="${myconf} --with-collation=utf8_general_ci"
323 else 320 else
324 myconf="${myconf} --with-charset=latin1" 321 myconf="${myconf} --with-charset=latin1"
325 myconf="${myconf} --with-collation=latin1_swedish_ci" 322 myconf="${myconf} --with-collation=latin1_swedish_ci"
326 fi 323 fi
327 324
328 if useq "embedded" ; then 325 if use embedded ; then
329 myconf="${myconf} --with-embedded-privilege-control" 326 myconf="${myconf} --with-embedded-privilege-control"
330 myconf="${myconf} --with-embedded-server" 327 myconf="${myconf} --with-embedded-server"
331 else 328 else
332 myconf="${myconf} --without-embedded-privilege-control" 329 myconf="${myconf} --without-embedded-privilege-control"
333 myconf="${myconf} --without-embedded-server" 330 myconf="${myconf} --without-embedded-server"
341 myconf="${myconf} --with-extra-tools" 338 myconf="${myconf} --with-extra-tools"
342 myconf="${myconf} --with-innodb" 339 myconf="${myconf} --with-innodb"
343 myconf="${myconf} --without-readline" 340 myconf="${myconf} --without-readline"
344 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 341 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
345 342
346 if useq "ssl" ; then
347 # --with-vio is not needed anymore, it's on by default and 343 # --with-vio is not needed anymore, it's on by default and
348 # has been removed from configure 344 # has been removed from configure
345 if use ssl ; then
349 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio" 346 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
347 fi
348
350 if mysql_version_is_at_least "5.2.0" ; then 349 if mysql_version_is_at_least "5.1.11" ; then
351 myconf="${myconf} --with-ssl" 350 myconf="${myconf} $(use_with ssl)"
351 else
352 myconf="${myconf} $(use_with ssl openssl)"
353 fi
354
355 if use berkdb ; then
356 # The following fix is due to a bug with bdb on SPARC's. See:
357 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
358 # It comes down to non-64-bit safety problems.
359 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
360 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
361 myconf="${myconf} --without-berkeley-db"
352 else 362 else
353 myconf="${myconf} --with-openssl" 363 myconf="${myconf} --with-berkeley-db=./bdb"
354 fi
355 else
356 myconf="${myconf} --without-openssl"
357 fi 364 fi
358 365 else
359 # The following fix is due to a bug with bdb on SPARC's. See:
360 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
361 # It comes down to non-64-bit safety problems.
362 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then
363 elog "Berkeley DB support was disabled due to incompatible arch"
364 myconf="${myconf} --without-berkeley-db" 366 myconf="${myconf} --without-berkeley-db"
365 else
366 if useq "berkdb" ; then
367 myconf="${myconf} --with-berkeley-db=./bdb"
368 else
369 myconf="${myconf} --without-berkeley-db"
370 fi
371 fi 367 fi
372 368
373 if mysql_version_is_at_least "4.1.3" ; then 369 if mysql_version_is_at_least "4.1.3" ; then
374 myconf="${myconf} --with-geometry" 370 myconf="${myconf} --with-geometry"
375 myconf="${myconf} $(use_with cluster ndbcluster)" 371 myconf="${myconf} $(use_with cluster ndbcluster)"
376 fi 372 fi
377 373
378 if mysql_version_is_at_least "4.1.3" && useq "extraengine" ; then 374 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
379 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 375 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
380 myconf="${myconf} --with-archive-storage-engine" 376 myconf="${myconf} --with-archive-storage-engine"
381 377
382 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 378 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
383 myconf="${myconf} --with-csv-storage-engine" 379 myconf="${myconf} --with-csv-storage-engine"
394 myconf="${myconf} --with-federated-storage-engine" 390 myconf="${myconf} --with-federated-storage-engine"
395 fi 391 fi
396 fi 392 fi
397 393
398 mysql_version_is_at_least "5.0.18" \ 394 mysql_version_is_at_least "5.0.18" \
399 && useq "max-idx-128" \ 395 && use max-idx-128 \
400 && myconf="${myconf} --with-max-indexes=128" 396 && myconf="${myconf} --with-max-indexes=128"
401} 397}
402 398
403configure_51() { 399configure_51() {
404 # TODO: !!!! readd --without-readline 400 # TODO: !!!! readd --without-readline
409 myconf="${myconf} --with-geometry" 405 myconf="${myconf} --with-geometry"
410 myconf="${myconf} --with-readline" 406 myconf="${myconf} --with-readline"
411 myconf="${myconf} --with-row-based-replication" 407 myconf="${myconf} --with-row-based-replication"
412 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 408 myconf="${myconf} --with-zlib=/usr/$(get_libdir)"
413 myconf="${myconf} --without-pstack" 409 myconf="${myconf} --without-pstack"
414 useq "max-idx-128" && myconf="${myconf} --with-max-indexes=128" 410 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
415 411
416 # 5.1 introduces a new way to manage storage engines (plugins) 412 # 5.1 introduces a new way to manage storage engines (plugins)
417 # like configuration=none 413 # like configuration=none
418 local plugins="csv,myisam,myisammrg,heap" 414 local plugins="csv,myisam,myisammrg,heap"
419 if useq "extraengine" ; then 415 if use extraengine ; then
420 # like configuration=max-no-ndb, archive and example removed in 5.1.11 416 # like configuration=max-no-ndb, archive and example removed in 5.1.11
421 plugins="${plugins},archive,blackhole,example,federated,partition" 417 plugins="${plugins},archive,blackhole,example,federated,partition"
422 418
423 elog "Before using the Federated storage engine, please be sure to read" 419 elog "Before using the Federated storage engine, please be sure to read"
424 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 420 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
425 fi 421 fi
426 422
427 if useq "innodb" ; then 423 if use innodb ; then
428 plugins="${plugins},innobase" 424 plugins="${plugins},innobase"
429 fi 425 fi
430 426
431 # like configuration=max-no-ndb 427 # like configuration=max-no-ndb
432 if useq "cluster" ; then 428 if use cluster ; then
433 plugins="${plugins},ndbcluster" 429 plugins="${plugins},ndbcluster"
434 myconf="${myconf} --with-ndb-binlog" 430 myconf="${myconf} --with-ndb-binlog"
435 fi 431 fi
436 432
437 if mysql_version_is_at_least "5.2" ; then 433 if mysql_version_is_at_least "5.2" ; then
447 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 443 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
448 444
449 einfo "Reconfiguring dir '${PWD}'" 445 einfo "Reconfiguring dir '${PWD}'"
450 AT_GNUCONF_UPDATE="yes" eautoreconf 446 AT_GNUCONF_UPDATE="yes" eautoreconf
451 447
452 local myconf 448 local myconf=""
453 myconf="${myconf} --with-mysql=${S}"
454 mkdir -p ${T}/lib
455 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}" 449 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
456 useq "debug" && myconf="${myconf} --with-debug=full" 450 use debug && myconf="${myconf} --with-debug=full"
457 # TODO is safe/needed to use econf here ? 451 # TODO: is it safe/needed to use econf here ?
458 ./configure ${myconf} || die "problem configuring pbxt storage engine" 452 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
459 # TODO is safe/needed to use emake here ? 453 # TODO: is it safe/needed to use emake here ?
460 make || die "problem making pbxt storage engine (${myconf})" 454 make || die "Problem making PBXT storage engine (${myconf})"
461 455
462 popd 456 popd
463 # TODO: modify test suite 457 # TODO: modify test suite for PBXT
464} 458}
465 459
466pbxt_src_install() { 460pbxt_src_install() {
467 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 461 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
468 make install || die "failed pbxt install" 462 make install || die "Failed to install PBXT"
469 popd 463 popd
470} 464}
471 465
472# 466#
473# EBUILD FUNCTIONS 467# EBUILD FUNCTIONS
474# 468#
475
476mysql_pkg_setup() { 469mysql_pkg_setup() {
477 enewgroup mysql 60 || die "problem adding 'mysql' group" 470 if hasq test ${FEATURES} ; then
478 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 471 if ! use minimal ; then
472 if ! hasq userpriv ${FEATURES} ; then
473 die "Testing with FEATURES=-userpriv is no longer supported by upstream"
474 fi
475 fi
476 fi
479 477
480 # Check for USE flag problems in pkg_setup 478 # Check for USE flag problems in pkg_setup
481 if useq "static" && useq "ssl" ; then 479 if use static && use ssl ; then
482 eerror "MySQL does not support being built statically with SSL support enabled!" 480 eerror "MySQL does not support being built statically with SSL support enabled!"
483 die "MySQL does not support being built statically with SSL support enabled!" 481 die "MySQL does not support being built statically with SSL support enabled!"
484 fi 482 fi
485 483
486 if ! mysql_version_is_at_least "5.0" \ 484 if ! mysql_version_is_at_least "5.0" \
487 && useq "raid" \ 485 && use raid \
488 && useq "static" ; then 486 && use static ; then
489 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically" 487 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
490 eerror "with RAID support enabled." 488 eerror "with RAID support enabled."
491 die "USE flags 'raid' and 'static' conflict!" 489 die "USE flags 'raid' and 'static' conflict!"
492 fi 490 fi
493 491
494 if mysql_version_is_at_least "4.1.3" \ 492 if mysql_version_is_at_least "4.1.3" \
495 && ( useq "cluster" || useq "extraengine" ) \ 493 && ( use cluster || use extraengine ) \
496 && useq "minimal" ; then 494 && use minimal ; then
497 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 495 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
498 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 496 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
499 fi 497 fi
498
499 # This should come after all of the die statements
500 enewgroup mysql 60 || die "problem adding 'mysql' group"
501 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
500 502
501 mysql_check_version_range "4.0 to 5.0.99.99" \ 503 mysql_check_version_range "4.0 to 5.0.99.99" \
502 && useq "berkdb" \ 504 && use berkdb \
503 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 505 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
504} 506}
505 507
506mysql_src_unpack() { 508mysql_src_unpack() {
507 # Initialize the proper variables first 509 # Initialize the proper variables first
508 mysql_init_vars 510 mysql_init_vars
509 511
510 unpack ${A} 512 unpack ${A}
513 # Grab the patches
514 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
515 # Bitkeeper checkout support
511 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then 516 if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
512 if mysql_check_version_range "5.1 to 5.1.99" ; then 517 if mysql_check_version_range "5.1 to 5.1.99" ; then
513 bitkeeper_fetch "mysql-5.1-ndb" 518 bitkeeper_fetch "mysql-5.1-ndb"
514 elif mysql_check_version_range "5.2.0 to 5.2.99" ; then 519 elif mysql_check_version_range "5.2 to 5.2.99" ; then
515 bitkeeper_fetch "mysql-5.2-falcon" 520 bitkeeper_fetch "mysql-5.2-falcon"
516 else 521 else
517 bitkeeper_fetch 522 bitkeeper_fetch
518 fi 523 fi
519 cd "${S}" 524 cd "${S}"
520 einfo "running upstream autorun on bk sources" 525 einfo "Running upstream autorun over BK sources ..."
521 BUILD/autorun.sh 526 BUILD/autorun.sh
522 else 527 else
523 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" 528 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
524 cd "${S}" 529 cd "${S}"
525 fi 530 fi
526 531
527 # Apply the patches for this MySQL version 532 # Apply the patches for this MySQL version
528 EPATCH_SUFFIX="patch" 533 EPATCH_SUFFIX="patch"
529 mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory" 534 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
535 # Clean out old items
536 rm -f "${EPATCH_SOURCE}"/*
537 # Now link in right patches
530 mysql_mv_patches 538 mysql_mv_patches
531 epatch || die "failed to apply all patches" 539 # And apply
540 epatch
532 541
533 # Additional checks, remove bundled zlib 542 # Additional checks, remove bundled zlib
534 rm -f "${S}/zlib/"*.[ch] 543 rm -f "${S}/zlib/"*.[ch]
535 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 544 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
536 rm -f "scripts/mysqlbug" 545 rm -f "scripts/mysqlbug"
551 560
552 local rebuilddirlist d 561 local rebuilddirlist d
553 562
554 if mysql_version_is_at_least "5.1.12" ; then 563 if mysql_version_is_at_least "5.1.12" ; then
555 rebuilddirlist="." 564 rebuilddirlist="."
556 # TODO IMPO! Check this with a cmake expert 565 # TODO: check this with a cmake expert
557 useq "innodb" \ 566 use innodb \
558 && cmake \ 567 && cmake \
559 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 568 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
560 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 569 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
561 "storage/innobase" 570 "storage/innobase"
562 else 571 else
563 rebuilddirlist=". innobase" 572 rebuilddirlist=". innobase"
564 fi 573 fi
565 574
569 AT_GNUCONF_UPDATE="yes" eautoreconf 578 AT_GNUCONF_UPDATE="yes" eautoreconf
570 popd &>/dev/null 579 popd &>/dev/null
571 done 580 done
572 581
573 if mysql_check_version_range "4.1 to 5.0.99.99" \ 582 if mysql_check_version_range "4.1 to 5.0.99.99" \
574 && useq "berkdb" ; then 583 && use berkdb ; then
575 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 584 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
585 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
586 || die "Could not copy libtool.m4 to bdb/dist/"
576 pushd "bdb/dist" \ 587 pushd "bdb/dist" &>/dev/null
577 && sh s_all \ 588 sh s_all \
578 || die "Failed bdb reconfigure" \ 589 || die "Failed bdb reconfigure"
579 &>/dev/null
580 popd &>/dev/null 590 popd &>/dev/null
581 fi 591 fi
582} 592}
583 593
584mysql_src_compile() { 594mysql_src_compile() {
586 mysql_init_vars 596 mysql_init_vars
587 597
588 # $myconf is modified by the configure_* functions 598 # $myconf is modified by the configure_* functions
589 local myconf="" 599 local myconf=""
590 600
591 if useq "minimal" ; then 601 if use minimal ; then
592 configure_minimal 602 configure_minimal
593 else 603 else
594 configure_common 604 configure_common
595 if mysql_version_is_at_least "5.1.10" ; then 605 if mysql_version_is_at_least "5.1.10" ; then
596 configure_51 606 configure_51
610 mysql_version_is_at_least "5.0" \ 620 mysql_version_is_at_least "5.0" \
611 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 621 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
612 export CXXFLAGS 622 export CXXFLAGS
613 623
614 econf \ 624 econf \
615 --program-suffix="${MY_SUFFIX}" \
616 --libexecdir="/usr/sbin" \ 625 --libexecdir="/usr/sbin" \
617 --sysconfdir="${MY_SYSCONFDIR}" \ 626 --sysconfdir="${MY_SYSCONFDIR}" \
618 --localstatedir="${MY_LOCALSTATEDIR}" \ 627 --localstatedir="${MY_LOCALSTATEDIR}" \
619 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 628 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
620 --libdir="${MY_LIBDIR}" \ 629 --libdir="${MY_LIBDIR}" \
631 | xargs -0 -n100 sed -i \ 640 | xargs -0 -n100 sed -i \
632 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 641 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
633 642
634 emake || die "emake failed" 643 emake || die "emake failed"
635 644
636 mysql_version_is_at_least "5.1.1" && useq "pbxt" && pbxt_src_compile 645 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
637} 646}
638 647
639mysql_src_install() { 648mysql_src_install() {
640 # Make sure the vars are correctly initialized 649 # Make sure the vars are correctly initialized
641 mysql_init_vars 650 mysql_init_vars
642 651
643 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die 652 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
644 653
645 mysql_version_is_at_least "5.1.12" && useq "pbxt" && pbxt_src_install 654 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
646 655
647 insinto "${MY_INCLUDEDIR}" 656 insinto "${MY_INCLUDEDIR}"
648 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h 657 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
649 658
650 # Convenience links 659 # Convenience links
651 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}" 660 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
652 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}" 661 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
653 dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}" 662 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
654 663
655 # Various junk (my-*.cnf moved elsewhere) 664 # Various junk (my-*.cnf moved elsewhere)
656 rm -Rf "${D}/usr/share/info" 665 rm -Rf "${D}/usr/share/info"
657 for removeme in "mysql-log-rotate" mysql.server* \ 666 for removeme in "mysql-log-rotate" mysql.server* \
658 binary-configure* my-*.cnf mi_test_all* 667 binary-configure* my-*.cnf mi_test_all*
659 do 668 do
660 rm -f "${D}"/usr/share/mysql/${removeme} 669 rm -f "${D}"/usr/share/mysql/${removeme}
661 done 670 done
662 671
663 # TODO change at Makefile-am level
664 if [[ ${PN} == "mysql-slotted" ]] ; then
665 for moveme in "mysql_fix_privilege_tables.sql" \
666 "fill_help_tables.sql" "ndb-config-2-node.ini"
667 do
668 mv -f "${D}/usr/share/mysql/${moveme}" "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
669 done
670 fi
671
672 # clean up stuff for a minimal build 672 # Clean up stuff for a minimal build
673 if useq "minimal" ; then 673 if use minimal ; then
674 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 674 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
675 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam} 675 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
676 rm -f "${D}/usr/sbin/mysqld" 676 rm -f "${D}/usr/sbin/mysqld"
677 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 677 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
678 fi 678 fi
679 679
680 if [[ ${PN} == "mysql-slotted" ]] ; then
681 local notcatched=$(ls "${D}/usr/share/mysql"/*)
682 if [[ -n "${notcatched}" ]] ; then
683 ewarn "QA notice"
684 ewarn "${notcatched} files in /usr/share/mysql"
685 ewarn "bug mysql-herd to manage them"
686 fi
687 rm -Rf "${D}/usr/share/mysql"
688 fi
689
690 # Configuration stuff 680 # Configuration stuff
691 if mysql_version_is_at_least "4.1" ; then 681 if mysql_version_is_at_least "4.1" ; then
692 mysql_mycnf_version="4.1" 682 mysql_mycnf_version="4.1"
693 else 683 else
694 mysql_mycnf_version="4.0" 684 mysql_mycnf_version="4.0"
695 fi 685 fi
696 insinto "${MY_SYSCONFDIR}" 686 insinto "${MY_SYSCONFDIR}"
697 doins scripts/mysqlaccess.conf 687 doins scripts/mysqlaccess.conf
698 sed -e "s!@MY_SUFFIX@!${MY_SUFFIX}!g" \
699 -e "s!@DATADIR@!${DATADIR}!g" \ 688 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
700 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 689 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
701 > "${TMPDIR}/my.cnf.ok" 690 > "${TMPDIR}/my.cnf.ok"
702 if mysql_version_is_at_least "4.1" && useq "latin1" ; then 691 if mysql_version_is_at_least "4.1" && use latin1 ; then
703 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 692 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
704 fi 693 fi
705 newins "${TMPDIR}/my.cnf.ok" my.cnf 694 newins "${TMPDIR}/my.cnf.ok" my.cnf
706 695
707 # Minimal builds don't have the MySQL server 696 # Minimal builds don't have the MySQL server
708 if ! useq "minimal" ; then 697 if ! use minimal ; then
709 # Empty directories ... 698 # Empty directories ...
710 diropts "-m0750" 699 diropts "-m0750"
711 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 700 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
712 dodir "${DATADIR}" 701 dodir "${MY_DATADIR}"
713 keepdir "${DATADIR}" 702 keepdir "${MY_DATADIR}"
714 chown -R mysql:mysql "${D}/${DATADIR}" 703 chown -R mysql:mysql "${D}/${MY_DATADIR}"
715 fi 704 fi
716 705
717 diropts "-m0755" 706 diropts "-m0755"
718 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 707 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
719 dodir "${folder}" 708 dodir "${folder}"
722 done 711 done
723 fi 712 fi
724 713
725 # Docs 714 # Docs
726 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 715 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
716 doinfo ${S}/Docs/mysql.info
727 717
728 # Minimal builds don't have the MySQL server 718 # Minimal builds don't have the MySQL server
729 if ! useq "minimal" ; then 719 if ! use minimal ; then
730 docinto "support-files" 720 docinto "support-files"
731 for script in \ 721 for script in \
732 support-files/my-*.cnf \ 722 support-files/my-*.cnf \
733 support-files/magic \ 723 support-files/magic \
734 support-files/ndb-config-2-node.ini 724 support-files/ndb-config-2-node.ini
738 728
739 docinto "scripts" 729 docinto "scripts"
740 for script in scripts/mysql* ; do 730 for script in scripts/mysql* ; do
741 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 731 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
742 done 732 done
743 fi
744 733
745 if [[ ${PN} == "mysql-slotted" ]] ; then
746 # MOVED HERE DUE TO BUG #121445
747 # create a list of files, to be used
748 # by external utilities
749 mkdir -p "${D}/var/lib/eselect/mysql/"
750 local filelist="${D}/var/lib/eselect/mysql/mysql${MY_SUFFIX}.filelist"
751 pushd "${D}/" &>/dev/null
752 find usr/bin/ usr/sbin/ \
753 -type f -name "*${MY_SUFFIX}*" \
754 -and -not -name "mysql_config${MY_SUFFIX}" \
755 > "${filelist}"
756 find usr/share/man \
757 -type f -name "*${MY_SUFFIX}*" \
758 | sed -e 's/$/.gz/' \
759 >> "${filelist}"
760 echo "${MY_SYSCONFDIR#"/"}" >> "${filelist}"
761 echo "${MY_LIBDIR#"/"}" >> "${filelist}"
762 echo "${MY_SHAREDSTATEDIR#"/"}" >> "${filelist}"
763 popd &>/dev/null
764 fi 734 fi
765 735
766 mysql_lib_symlinks "${D}" 736 mysql_lib_symlinks "${D}"
767} 737}
768 738
774mysql_pkg_postinst() { 744mysql_pkg_postinst() {
775 # Make sure the vars are correctly initialized 745 # Make sure the vars are correctly initialized
776 mysql_init_vars 746 mysql_init_vars
777 747
778 # Check FEATURES="collision-protect" before removing this 748 # Check FEATURES="collision-protect" before removing this
779 [[ -d "${ROOT}/var/log/mysql" ]] \
780 || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" 749 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
781 750
782 # Secure the logfiles 751 # Secure the logfiles
783 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 752 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
784 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 753 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
785 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 754 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
786 755
787 # Minimal builds don't have the MySQL server 756 # Minimal builds don't have the MySQL server
788 if ! useq "minimal" ; then 757 if ! use minimal ; then
789 docinto "support-files" 758 docinto "support-files"
790 for script in \ 759 for script in \
791 support-files/my-*.cnf \ 760 support-files/my-*.cnf \
792 support-files/magic \ 761 support-files/magic \
793 support-files/ndb-config-2-node.ini 762 support-files/ndb-config-2-node.ini
797 766
798 docinto "scripts" 767 docinto "scripts"
799 for script in scripts/mysql* ; do 768 for script in scripts/mysql* ; do
800 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 769 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
801 done 770 done
802 fi
803 771
804 einfo "you may want to read slotting upgrade documents in the overlay" 772 einfo
805 if useq "pbxt" && mysql_version_is_at_least "5.1" ; then 773 elog "You might want to run:"
806 # TODO tell it better ;-) 774 elog "\"emerge --config =${CATEGORY}/${PF}\""
775 elog "if this is a new install."
776 einfo
777 fi
778
779 if mysql_version_is_at_least "5.1.12" && use pbxt ; then
780 # TODO: explain it better
807 einfo "mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';" 781 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
808 einfo "CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;" 782 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
809 einfo "if, after that you cannot start the mysql server" 783 elog "if, after that, you cannot start the MySQL server,"
810 einfo "remove the ${MY_DATADIR}/mysql/plugin.* files, then" 784 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
811 einfo "use the mysql upgrade script to restore the table" 785 elog "use the MySQL upgrade script to restore the table"
812 einfo " or " 786 elog "or execute the following SQL command:"
813 einfo "CREATE TABLE IF NOT EXISTS plugin (" 787 elog " CREATE TABLE IF NOT EXISTS plugin ("
814 einfo " name char(64) binary DEFAULT '' NOT NULL," 788 elog " name char(64) binary DEFAULT '' NOT NULL,"
815 einfo " dl char(128) DEFAULT '' NOT NULL," 789 elog " dl char(128) DEFAULT '' NOT NULL,"
816 einfo " PRIMARY KEY (name)" 790 elog " PRIMARY KEY (name)"
817 einfo ") CHARACTER SET utf8 COLLATE utf8_bin;" 791 elog " ) CHARACTER SET utf8 COLLATE utf8_bin;"
818 fi 792 fi
793
819 mysql_check_version_range "4.0 to 5.0.99.99" \ 794 mysql_check_version_range "4.0 to 5.0.99.99" \
820 && useq "berkdb" \ 795 && use berkdb \
821 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 796 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
822} 797}
823 798
824mysql_pkg_config() { 799mysql_pkg_config() {
825 # Make sure the vars are correctly initialized 800 # Make sure the vars are correctly initialized
826 mysql_init_vars 801 mysql_init_vars
827 802
828 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 803 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
829 804
830 if built_with_use ${CATEGORY}/${PN} minimal ; then 805 if built_with_use ${CATEGORY}/${PN} minimal ; then
831 die "Minimal builds do NOT include the MySQL server" 806 die "Minimal builds do NOT include the MySQL server"
832 fi 807 fi
833 808
834 local pwd1="a" 809 local pwd1="a"
835 local pwd2="b" 810 local pwd2="b"
836 local maxtry=5 811 local maxtry=5
837 812
838 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 813 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
839 ewarn "You have already a MySQL database in place." 814 ewarn "You have already a MySQL database in place."
840 ewarn "(${ROOT}/${DATADIR}/*)" 815 ewarn "(${ROOT}/${MY_DATADIR}/*)"
841 ewarn "Please rename or delete it if you wish to replace it." 816 ewarn "Please rename or delete it if you wish to replace it."
842 die "MySQL database already exists!" 817 die "MySQL database already exists!"
843 fi 818 fi
844 819
845 einfo "Creating the mysql database and setting proper" 820 einfo "Creating the mysql database and setting proper"
864 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 839 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
865 || touch "${TMPDIR}/fill_help_tables.sql" 840 || touch "${TMPDIR}/fill_help_tables.sql"
866 help_tables="${TMPDIR}/fill_help_tables.sql" 841 help_tables="${TMPDIR}/fill_help_tables.sql"
867 842
868 pushd "${TMPDIR}" &>/dev/null 843 pushd "${TMPDIR}" &>/dev/null
869 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 844 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
845 if [ $? -ne 0 ]; then
846 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
847 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
848 fi
870 popd &>/dev/null 849 popd &>/dev/null
871 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 850 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
872 || die "MySQL databases not installed" 851 || die "MySQL databases not installed"
873 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 852 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2> /dev/null
874 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 853 chmod 0750 "${ROOT}/${MY_DATADIR}" 2> /dev/null
875 854
876 if mysql_version_is_at_least "4.1.3" ; then 855 if mysql_version_is_at_least "4.1.3" ; then
877 options="--skip-ndbcluster" 856 options="--skip-ndbcluster"
878 857
879 # Filling timezones, see 858 # Filling timezones, see
890 local mysqld="${ROOT}/usr/sbin/mysqld \ 869 local mysqld="${ROOT}/usr/sbin/mysqld \
891 ${options} \ 870 ${options} \
892 --user=mysql \ 871 --user=mysql \
893 --skip-grant-tables \ 872 --skip-grant-tables \
894 --basedir=${ROOT}/usr \ 873 --basedir=${ROOT}/usr \
895 --datadir=${ROOT}/${DATADIR} \ 874 --datadir=${ROOT}/${MY_DATADIR} \
896 --skip-innodb \ 875 --skip-innodb \
897 --skip-bdb \ 876 --skip-bdb \
898 --skip-networking \ 877 --skip-networking \
899 --max_allowed_packet=8M \ 878 --max_allowed_packet=8M \
900 --net_buffer_length=16K \ 879 --net_buffer_length=16K \
930 wait %1 909 wait %1
931 einfo "Done" 910 einfo "Done"
932} 911}
933 912
934mysql_pkg_postrm() { 913mysql_pkg_postrm() {
935 if [[ ${PN} == "mysql-slotted" ]] ; then
936 mysql_lib_symlinks 914 : # mysql_lib_symlinks "${D}"
937 mysql_clients_link_to_best_version
938 fi
939} 915}

Legend:
Removed from v.1.61  
changed lines
  Added in v.1.90

  ViewVC Help
Powered by ViewVC 1.1.20