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

Diff of /eclass/mysql.eclass

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

Revision 1.44 Revision 1.51
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2006 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.44 2006/11/23 13:52:28 vivo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.51 2006/12/29 20:34:02 vivo Exp $
4 4
5# Author: Francesco Riosa <vivo@gentoo.org> 5# Author: Francesco Riosa <vivo@gentoo.org>
6# Maintainer: Luca Longinotti <chtekk@gentoo.org> 6# Maintainer: Luca Longinotti <chtekk@gentoo.org>
7 7
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too 8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too
59MY_P="${P/_/-}" 59MY_P="${P/_/-}"
60MY_P="${MY_P/-alpha/-bk-}" # BitKeeper ebuilds 60MY_P="${MY_P/-alpha/-bk-}" # BitKeeper ebuilds
61MY_P="${MY_P/-community/}" 61MY_P="${MY_P/-community/}"
62 62
63# Define correct SRC_URIs 63# Define correct SRC_URIs
64SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${MY_P}${MYSQL_RERELEASE}.tar.gz" 64SRC_URI="${BASE_URI}/${MY_P}${MYSQL_RERELEASE}.tar.gz"
65if [[ -n "${MYSQL_PATCHSET_REV}" ]] ; then 65if [[ -n "${MYSQL_PATCHSET_REV}" ]] ; then
66 MYSQL_PATCHSET_FILENAME="${PN}-patchset-${MY_FIXED_PV}-r${MYSQL_PATCHSET_REV}.tar.bz2" 66 MYSQL_PATCHSET_FILENAME="${PN}-patchset-${MY_FIXED_PV}-r${MYSQL_PATCHSET_REV}.tar.bz2"
67 # We add the Gentoo mirror here, as we only use primaryuri for the MySQL tarball 67 # We add the Gentoo mirror here, as we only use primaryuri for the MySQL tarball
68 SRC_URI="${SRC_URI} http://gentoo.longitekk.com/${MYSQL_PATCHSET_FILENAME}" 68 SRC_URI="${SRC_URI} http://g3nt8.org/patches/${MYSQL_PATCHSET_FILENAME}"
69fi 69fi
70 70
71DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 71DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
72HOMEPAGE="http://www.mysql.com/" 72HOMEPAGE="http://www.mysql.com/"
73SLOT="0" 73SLOT="0"
97 pkg_postinst pkg_config pkg_postrm 97 pkg_postinst pkg_config pkg_postrm
98 98
99# 99#
100# HELPER FUNCTIONS: 100# HELPER FUNCTIONS:
101# 101#
102
103bitkeeper_fetch() {
104
105 local tpv=( ${PV//[-._]/ } )
106 local reposuf="${tpv[0]}.${tpv[1]}"
107 useq "cluster" && reposuf="${reposuf}-ndb"
108 local repo_uri="bk://mysql.bkbits.net/mysql-${reposuf}"
109 ## -- ebk_store_dir: bitkeeper sources store directory
110 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
111 ## -- ebk_fetch_cmd: bitkeeper fetch command
112 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
113 # hint: does not work
114 local ebk_fetch_cmd="sfioball"
115 ## -- ebk_update_cmd: bitkeeper update command
116 local ebk_update_cmd="update"
117
118 #addread "/etc/bitkeeper"
119 addwrite "${ebk_store_dir}"
120
121 if [[ ! -d "${ebk_store_dir}" ]]; then
122 debug-print "${FUNCNAME}: initial checkout. creating bitkeeper directory"
123 mkdir -p "${ebk_store_dir}" || die "${EBK}: can't mkdir ${ebk_store_dir}."
124 fi
125
126 pushd "${ebk_store_dir}" || die "${EBK}: can't chdir to ${ebk_store_dir}"
127
128 local wc_path=mysql-${reposuf}
129
130 if [[ ! -d "${wc_path}" ]]; then
131 local options="-r+"
132 # first check out
133 einfo "bitkeeper check out start -->"
134 einfo " repository: ${repo_uri}"
135 ${ebk_fetch_cmd} ${options} "${repo_uri}" ${wc_path} \
136 || die "${EBK}: can't fetch from ${repo_uri}."
137 else
138 if [[ ! -d "${wc_path}/BK" ]]; then
139 popd
140 die "Look like ${wc_path} is not a bitkeeper path."
141 fi
142
143 # update working copy
144 einfo "bitkeeper update start -->"
145 einfo " repository: ${repo_uri}"
146
147 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
148 || die "BK: can't update from ${repo_uri} to ${wc_path}."
149
150 fi
151
152 einfo " working copy: ${wc_path}"
153 cd "${wc_path}"
154 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}."
155
156 echo
157 popd
158
159}
160
161mysql_disable_test() {
162 local testname="${1}" ; shift
163 local reason="${@}"
164 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
165 echo ${testname} : ${reason} >> "${mysql_disable_file}"
166 ewarn "test \"${testname}\" disabled because: \"${reason}\""
167}
102 168
103# void mysql_init_vars() 169# void mysql_init_vars()
104# 170#
105# Initialize global variables 171# Initialize global variables
106# 2005-11-19 <vivo@gentoo.org> 172# 2005-11-19 <vivo@gentoo.org>
155 export MY_INCLUDEDIR 221 export MY_INCLUDEDIR
156 export DATADIR 222 export DATADIR
157} 223}
158 224
159configure_minimal() { 225configure_minimal() {
160 # These are things we exclude from a minimal build, please 226 # These are things we exclude from a minimal build, please
161 # note that the server actually does get built and installed, 227 # note that the server actually does get built and installed,
162 # but we then delete it before packaging. 228 # but we then delete it before packaging.
163 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 229 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication"
164 230
165 for i in ${minimal_exclude_list} ; do 231 for i in ${minimal_exclude_list} ; do
166 myconf="${myconf} --without-${i}" 232 myconf="${myconf} --without-${i}"
167 done 233 done
168 myconf="${myconf} --with-extra-charsets=none" 234 myconf="${myconf} --with-extra-charsets=none"
235 myconf="${myconf} --enable-local-infile"
236
237 if useq "static" ; then
238 myconf="${myconf} --with-client-ldflags=-all-static"
239 myconf="${myconf} --disable-shared"
240 else
241 myconf="${myconf} --enable-shared --enable-static"
242 fi
243
244 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then
245 myconf="${myconf} --with-charset=utf8"
246 myconf="${myconf} --with-collation=utf8_general_ci"
247 else
248 myconf="${myconf} --with-charset=latin1"
249 myconf="${myconf} --with-collation=latin1_swedish_ci"
250 fi
169} 251}
170 252
171configure_common() { 253configure_common() {
172 myconf="${myconf} $(use_with big-tables)" 254 myconf="${myconf} $(use_with big-tables)"
173 myconf="${myconf} --enable-local-infile" 255 myconf="${myconf} --enable-local-infile"
187 269
188 if useq "debug" ; then 270 if useq "debug" ; then
189 myconf="${myconf} --with-debug=full" 271 myconf="${myconf} --with-debug=full"
190 else 272 else
191 myconf="${myconf} --without-debug" 273 myconf="${myconf} --without-debug"
192 mysql_version_is_at_least "4.01.03.00" \ 274 mysql_version_is_at_least "4.1.3" \
193 && useq "cluster" \ 275 && useq "cluster" \
194 && myconf="${myconf} --without-ndb-debug" 276 && myconf="${myconf} --without-ndb-debug"
195 fi 277 fi
196 278
197 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then 279 if mysql_version_is_at_least "4.1" && ! useq "latin1" ; then
198 myconf="${myconf} --with-charset=utf8" 280 myconf="${myconf} --with-charset=utf8"
199 myconf="${myconf} --with-collation=utf8_general_ci" 281 myconf="${myconf} --with-collation=utf8_general_ci"
200 else 282 else
201 myconf="${myconf} --with-charset=latin1" 283 myconf="${myconf} --with-charset=latin1"
202 myconf="${myconf} --with-collation=latin1_swedish_ci" 284 myconf="${myconf} --with-collation=latin1_swedish_ci"
216 myconf="${myconf} $(use_with perl bench)" 298 myconf="${myconf} $(use_with perl bench)"
217 myconf="${myconf} --enable-assembler" 299 myconf="${myconf} --enable-assembler"
218 myconf="${myconf} --with-extra-tools" 300 myconf="${myconf} --with-extra-tools"
219 myconf="${myconf} --with-innodb" 301 myconf="${myconf} --with-innodb"
220 myconf="${myconf} --without-readline" 302 myconf="${myconf} --without-readline"
221 mysql_version_is_at_least "5.00.00.00" || myconf="${myconf} $(use_with raid)" 303 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
222 304
223 if useq "ssl" ; then 305 if useq "ssl" ; then
224 # --with-vio is not needed anymore, it's on by default and 306 # --with-vio is not needed anymore, it's on by default and
225 # has been removed from configure 307 # has been removed from configure
226 mysql_version_is_at_least "5.00.04.00" || myconf="${myconf} --with-vio" 308 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
227 if mysql_version_is_at_least "5.00.06.00" ; then 309 if mysql_version_is_at_least "5.0.6" ; then
228 # myconf="${myconf} --with-yassl" 310 # myconf="${myconf} --with-yassl"
229 myconf="${myconf} --with-openssl" 311 myconf="${myconf} --with-openssl"
230 else 312 else
231 myconf="${myconf} --with-openssl" 313 myconf="${myconf} --with-openssl"
232 fi 314 fi
246 else 328 else
247 myconf="${myconf} --without-berkeley-db" 329 myconf="${myconf} --without-berkeley-db"
248 fi 330 fi
249 fi 331 fi
250 332
251 if mysql_version_is_at_least "4.01.03.00" ; then 333 if mysql_version_is_at_least "4.1.3" ; then
252 myconf="${myconf} --with-geometry" 334 myconf="${myconf} --with-geometry"
253 myconf="${myconf} $(use_with cluster ndbcluster)" 335 myconf="${myconf} $(use_with cluster ndbcluster)"
254 fi 336 fi
255 337
256 if mysql_version_is_at_least "4.01.03.00" && useq "extraengine" ; then 338 if mysql_version_is_at_least "4.1.3" && useq "extraengine" ; then
257 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 339 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
258 myconf="${myconf} --with-archive-storage-engine" 340 myconf="${myconf} --with-archive-storage-engine"
259 341
260 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 342 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
261 myconf="${myconf} --with-csv-storage-engine" 343 myconf="${myconf} --with-csv-storage-engine"
264 myconf="${myconf} --with-blackhole-storage-engine" 346 myconf="${myconf} --with-blackhole-storage-engine"
265 347
266 # http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html 348 # http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
267 # http://dev.mysql.com/doc/mysql/en/federated-description.html 349 # http://dev.mysql.com/doc/mysql/en/federated-description.html
268 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html 350 # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
269 if mysql_version_is_at_least "5.00.03.00" ; then 351 if mysql_version_is_at_least "5.0.3" ; then
270 elog "Before using the Federated storage engine, please be sure to read" 352 elog "Before using the Federated storage engine, please be sure to read"
271 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 353 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
272 myconf="${myconf} --with-federated-storage-engine" 354 myconf="${myconf} --with-federated-storage-engine"
273 fi 355 fi
274 fi 356 fi
275 357
276 mysql_version_is_at_least "5.00.18.00" \ 358 mysql_version_is_at_least "5.0.18" \
277 && useq "max-idx-128" \ 359 && useq "max-idx-128" \
278 && myconf="${myconf} --with-max-indexes=128" 360 && myconf="${myconf} --with-max-indexes=128"
279} 361}
280 362
281configure_51() { 363configure_51() {
313 fi 395 fi
314 396
315 myconf="${myconf} --with-plugins=${plugins}" 397 myconf="${myconf} --with-plugins=${plugins}"
316} 398}
317 399
400pbxt_src_compile() {
401 mysql_init_vars
402
403 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
404
405 einfo "Reconfiguring dir '${PWD}'"
406 AT_GNUCONF_UPDATE="yes" eautoreconf
407
408 local myconf
409 myconf="${myconf} --with-mysql=${S}"
410 mkdir -p ${T}/lib
411 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}"
412 useq "debug" && myconf="${myconf} --with-debug=full"
413 # TODO is safe/needed to use econf here ?
414 ./configure ${myconf} || die "problem configuring pbxt storage engine"
415 # TODO is safe/needed to use emake here ?
416 make || die "problem making pbxt storage engine (${myconf})"
417
418 popd
419 # TODO: modify test suite
420}
421
422pbxt_src_install() {
423 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
424 make install || die "failed pbxt install"
425 popd
426}
427
318# 428#
319# EBUILD FUNCTIONS 429# EBUILD FUNCTIONS
320# 430#
321 431
322mysql_pkg_setup() { 432mysql_pkg_setup() {
323 enewgroup mysql 60 || die "problem adding 'mysql' group" 433 enewgroup mysql 60 || die "problem adding 'mysql' group"
324 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 434 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
325 435
326 if mysql_version_is_at_least "5.01.12.00" && useq "innodb" ; then
327 eerror "InnoDB now uses cmake to build, this is a TODO item, will be fixed shortly!"
328 die "InnoDB now uses cmake to build, this is a TODO item, will be fixed shortly!"
329 fi
330
331 # Check for USE flag problems in pkg_setup 436 # Check for USE flag problems in pkg_setup
332 if useq "static" && useq "ssl" ; then 437 if useq "static" && useq "ssl" ; then
333 eerror "MySQL does not support being built statically with SSL support enabled!" 438 eerror "MySQL does not support being built statically with SSL support enabled!"
334 die "MySQL does not support being built statically with SSL support enabled!" 439 die "MySQL does not support being built statically with SSL support enabled!"
335 fi 440 fi
336 441
337 if ! mysql_version_is_at_least "5.00.00.00" \ 442 if ! mysql_version_is_at_least "5.0" \
338 && useq "raid" \ 443 && useq "raid" \
339 && useq "static" ; then 444 && useq "static" ; then
340 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically" 445 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
341 eerror "with RAID support enabled." 446 eerror "with RAID support enabled."
342 die "USE flags 'raid' and 'static' conflict!" 447 die "USE flags 'raid' and 'static' conflict!"
343 fi 448 fi
344 449
345 if mysql_version_is_at_least "4.01.03.00" \ 450 if mysql_version_is_at_least "4.1.3" \
346 && ( useq "cluster" || useq "extraengine" ) \ 451 && ( useq "cluster" || useq "extraengine" ) \
347 && useq "minimal" ; then 452 && useq "minimal" ; then
348 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 453 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
349 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 454 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
350 fi 455 fi
351 456
352 mysql_check_version_range "4.00.00.00 to 5.00.99.99" \ 457 mysql_check_version_range "4.0 to 5.0.99.99" \
353 && useq "berkdb" \ 458 && useq "berkdb" \
354 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 459 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
355} 460}
356 461
357mysql_src_unpack() { 462mysql_src_unpack() {
391 -exec rm -f {} \; 496 -exec rm -f {} \;
392 rm -f "ltmain.sh" 497 rm -f "ltmain.sh"
393 rm -f "scripts/mysqlbug" 498 rm -f "scripts/mysqlbug"
394 fi 499 fi
395 500
396 local rebuilddirlist bdbdir d 501 local rebuilddirlist d
397 502
398 if mysql_version_is_at_least "5.01.12.00" ; then 503 if mysql_version_is_at_least "5.1.12" ; then
399 # TODO: innodb is using cmake now?
400 rebuilddirlist="." 504 rebuilddirlist="."
401 bdbdir='' 505 # TODO IMPO! Check this with a cmake expert
506 useq "innodb" \
507 && cmake \
508 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \
509 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \
510 "storage/innobase"
402 else 511 else
403 rebuilddirlist=". innobase" 512 rebuilddirlist=". innobase"
404 bdbdir='bdb/dist'
405 fi 513 fi
406 514
407 for d in ${rebuilddirlist} ; do 515 for d in ${rebuilddirlist} ; do
408 einfo "Reconfiguring dir '${d}'" 516 einfo "Reconfiguring dir '${d}'"
409 pushd "${d}" &>/dev/null 517 pushd "${d}" &>/dev/null
410 AT_GNUCONF_UPDATE="yes" eautoreconf 518 AT_GNUCONF_UPDATE="yes" eautoreconf
411 popd &>/dev/null 519 popd &>/dev/null
412 done 520 done
413 521
414 if mysql_check_version_range "4.01.00.00 to 5.00.99.99" \ 522 if mysql_check_version_range "4.1 to 5.0.99.99" \
415 && useq "berkdb" ; then 523 && useq "berkdb" ; then
416 [[ -w "${bdbdir}/ltmain.sh" ]] && cp -f "ltmain.sh" "${bdbdir}/ltmain.sh" 524 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
417 pushd "${bdbdir}" \ 525 pushd "bdb/dist" \
418 && sh s_all \ 526 && sh s_all \
419 || die "Failed bdb reconfigure" \ 527 || die "Failed bdb reconfigure" \
420 &>/dev/null 528 &>/dev/null
421 popd &>/dev/null 529 popd &>/dev/null
422 fi 530 fi
431 539
432 if useq "minimal" ; then 540 if useq "minimal" ; then
433 configure_minimal 541 configure_minimal
434 else 542 else
435 configure_common 543 configure_common
436 if mysql_version_is_at_least "5.01.10.00" ; then 544 if mysql_version_is_at_least "5.1.10" ; then
437 configure_51 545 configure_51
438 else 546 else
439 configure_40_41_50 547 configure_40_41_50
440 fi 548 fi
441 fi 549 fi
444 filter-flags "-O" "-O[01]" 552 filter-flags "-O" "-O[01]"
445 553
446 # glib-2.3.2_pre fix, bug #16496 554 # glib-2.3.2_pre fix, bug #16496
447 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 555 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
448 556
449 append-flags "-fno-exceptions -fno-strict-aliasing" 557 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
450 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 558 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
451 mysql_version_is_at_least "5.00.00.00" \ 559 mysql_version_is_at_least "5.0" \
452 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 560 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
453 export CXXFLAGS 561 export CXXFLAGS
454 562
455 econf \ 563 econf \
456 --libexecdir="/usr/sbin" \ 564 --libexecdir="/usr/sbin" \
503 rm -f "${D}/usr/sbin/mysqld" 611 rm -f "${D}/usr/sbin/mysqld"
504 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 612 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
505 fi 613 fi
506 614
507 # Configuration stuff 615 # Configuration stuff
508 if mysql_version_is_at_least "4.01.00.00" ; then 616 if mysql_version_is_at_least "4.1" ; then
509 mysql_mycnf_version="4.1" 617 mysql_mycnf_version="4.1"
510 else 618 else
511 mysql_mycnf_version="4.0" 619 mysql_mycnf_version="4.0"
512 fi 620 fi
513 insinto "${MY_SYSCONFDIR}" 621 insinto "${MY_SYSCONFDIR}"
514 doins "scripts/mysqlaccess.conf" 622 doins "scripts/mysqlaccess.conf"
515 sed -e "s!@DATADIR@!${DATADIR}!g" \ 623 sed -e "s!@DATADIR@!${DATADIR}!g" \
516 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 624 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
517 > "${TMPDIR}/my.cnf.ok" 625 > "${TMPDIR}/my.cnf.ok"
518 if mysql_version_is_at_least "4.01.00.00" && useq "latin1" ; then 626 if mysql_version_is_at_least "4.1" && useq "latin1" ; then
519 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 627 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
520 fi 628 fi
521 newins "${TMPDIR}/my.cnf.ok" my.cnf 629 newins "${TMPDIR}/my.cnf.ok" my.cnf
522 630
523 insinto "/etc/conf.d" 631 insinto "/etc/conf.d"
600 elog "if this is a new install." 708 elog "if this is a new install."
601 einfo 709 einfo
602 mysql_version_is_at_least "5.01.00.00" \ 710 mysql_version_is_at_least "5.01.00.00" \
603 || elog "InnoDB is *not* optional as of MySQL-4.0.24, at the request of upstream." 711 || elog "InnoDB is *not* optional as of MySQL-4.0.24, at the request of upstream."
604 fi 712 fi
605 mysql_check_version_range "4.00.00.00 to 5.00.99.99" \ 713 mysql_check_version_range "4.0 to 5.0.99.99" \
606 && useq "berkdb" \ 714 && useq "berkdb" \
607 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 715 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
608} 716}
609 717
610mysql_pkg_config() { 718mysql_pkg_config() {
611 # Make sure the vars are correctly initialized 719 # Make sure the vars are correctly initialized
612 mysql_init_vars 720 mysql_init_vars
613 721
614 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 722 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR"
615 723
616 if built_with_use dev-db/mysql minimal ; then 724 if built_with_use ${CATEGORY}/${PN} minimal ; then
617 die "Minimal builds do NOT include the MySQL server" 725 die "Minimal builds do NOT include the MySQL server"
618 fi 726 fi
619 727
620 local pwd1="a" 728 local pwd1="a"
621 local pwd2="b" 729 local pwd2="b"
657 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 765 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \
658 || die "MySQL databases not installed" 766 || die "MySQL databases not installed"
659 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 767 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null
660 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 768 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null
661 769
662 if mysql_version_is_at_least "4.01.03.00" ; then 770 if mysql_version_is_at_least "4.1.3" ; then
663 options="--skip-ndbcluster" 771 options="--skip-ndbcluster"
664 772
665 # Filling timezones, see 773 # Filling timezones, see
666 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 774 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
667 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 775 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
716 wait %1 824 wait %1
717 einfo "Done" 825 einfo "Done"
718} 826}
719 827
720mysql_pkg_postrm() { 828mysql_pkg_postrm() {
721 mysql_lib_symlinks 829 : #mysql_lib_symlinks
722} 830}

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.51

  ViewVC Help
Powered by ViewVC 1.1.20