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

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

  ViewVC Help
Powered by ViewVC 1.1.20