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

Diff of /eclass/mysql.eclass

Parent Directory | Revision Log | View Patch Patch

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

 Legend:



Removed from v.1.39
 


changed lines


 
Added in v.1.107
 Legend:



Removed from v.1.39
 


changed lines


 
Added in v.1.107
-Removed from v.1.39
+Added in v.1.107

	ViewVC Help
Powered by ViewVC 1.1.20