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

Diff of /eclass/mysql-autotools.eclass

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

Revision 1.1 Revision 1.14
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 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-autotools.eclass,v 1.1 2011/07/13 07:07:15 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.14 2013/01/28 02:13:05 robbat2 Exp $
4 4
5# @ECLASS: mysql-autotools.eclass 5# @ECLASS: mysql-autotools.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers:
9# - MySQL Team <mysql-bugs@gentoo.org> 7# MySQL Team <mysql-bugs@gentoo.org>
10# - Robin H. Johnson <robbat2@gentoo.org> 8# Robin H. Johnson <robbat2@gentoo.org>
11# - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> 9# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
12# - Luca Longinotti <chtekk@gentoo.org> 10# Luca Longinotti <chtekk@gentoo.org>
11# @AUTHOR:
12# Francesco Riosa <vivo@gentoo.org> (retired)
13# @BLURB: This eclass provides support for autotools based mysql releases 13# @BLURB: This eclass provides support for autotools based mysql releases
14# @DESCRIPTION: 14# @DESCRIPTION:
15# The mysql-autotools.eclass provides the support to build the mysql 15# The mysql-autotools.eclass provides the support to build the mysql
16# ebuilds using the autotools build system. This eclass provides 16# ebuilds using the autotools build system. This eclass provides
17# the src_unpack, src_prepare, src_configure, src_compile, scr_install, 17# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
18# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks. 18# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
19 19
20inherit autotools 20inherit autotools flag-o-matic multilib prefix
21 21
22# 22#
23# HELPER FUNCTIONS: 23# HELPER FUNCTIONS:
24# 24#
25 25
94 myconf="${myconf} --with-collation=utf8_general_ci" 94 myconf="${myconf} --with-collation=utf8_general_ci"
95 else 95 else
96 myconf="${myconf} --with-charset=latin1" 96 myconf="${myconf} --with-charset=latin1"
97 myconf="${myconf} --with-collation=latin1_swedish_ci" 97 myconf="${myconf} --with-collation=latin1_swedish_ci"
98 fi 98 fi
99
100 # MariaDB requires this flag in order to link to GPLv3 readline v6 or greater
101 # A note is added to the configure output
102 if [[ "${PN}" == "mariadb" ]] && mysql_version_is_at_least "5.1.61" ; then
103 myconf="${myconf} --disable-distribution"
104 fi
99} 105}
100 106
101# @FUNCTION: mysql-autotools_configure_common 107# @FUNCTION: mysql-autotools_configure_common
102# @DESCRIPTION: 108# @DESCRIPTION:
103# Helper function to configure the common builds 109# Helper function to configure the common builds
106 myconf="${myconf} $(use_with big-tables)" 112 myconf="${myconf} $(use_with big-tables)"
107 myconf="${myconf} --enable-local-infile" 113 myconf="${myconf} --enable-local-infile"
108 myconf="${myconf} --with-extra-charsets=all" 114 myconf="${myconf} --with-extra-charsets=all"
109 myconf="${myconf} --with-mysqld-user=mysql" 115 myconf="${myconf} --with-mysqld-user=mysql"
110 myconf="${myconf} --with-server" 116 myconf="${myconf} --with-server"
111 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 117 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
112 myconf="${myconf} --without-libwrap" 118 myconf="${myconf} --without-libwrap"
113 119
114 if use static ; then 120 if use static ; then
115 myconf="${myconf} --with-mysqld-ldflags=-all-static" 121 myconf="${myconf} --with-mysqld-ldflags=-all-static"
116 myconf="${myconf} --with-client-ldflags=-all-static" 122 myconf="${myconf} --with-client-ldflags=-all-static"
121 127
122 if use debug ; then 128 if use debug ; then
123 myconf="${myconf} --with-debug=full" 129 myconf="${myconf} --with-debug=full"
124 else 130 else
125 myconf="${myconf} --without-debug" 131 myconf="${myconf} --without-debug"
126 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ); then 132 if ( use cluster ); then
127 myconf="${myconf} --without-ndb-debug" 133 myconf="${myconf} --without-ndb-debug"
128 fi 134 fi
129 fi 135 fi
130 136
131 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then 137 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
158mysql-autotools_configure_51() { 164mysql-autotools_configure_51() {
159 165
160 # TODO: !!!! readd --without-readline 166 # TODO: !!!! readd --without-readline
161 # the failure depend upon config/ac-macros/readline.m4 checking into 167 # the failure depend upon config/ac-macros/readline.m4 checking into
162 # readline.h instead of history.h 168 # readline.h instead of history.h
163 myconf="${myconf} $(use_with ssl ssl /usr)" 169 myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
164 myconf="${myconf} --enable-assembler" 170 myconf="${myconf} --enable-assembler"
165 myconf="${myconf} --with-geometry" 171 myconf="${myconf} --with-geometry"
166 myconf="${myconf} --with-readline" 172 myconf="${myconf} --with-readline"
167 myconf="${myconf} --with-zlib-dir=/usr/" 173 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
168 myconf="${myconf} --without-pstack" 174 myconf="${myconf} --without-pstack"
169 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin" 175 myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
170 176
171 # This is an explict die here, because if we just forcibly disable it, then the 177 # This is an explict die here, because if we just forcibly disable it, then the
172 # user's data is not accessible. 178 # user's data is not accessible.
173 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently" 179 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
174 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 180 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
175 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
176 myconf="${myconf} $(use_enable community community-features)" 181 myconf="${myconf} $(use_enable community community-features)"
177 if use community; then 182 if use community; then
178 myconf="${myconf} $(use_enable profiling)" 183 myconf="${myconf} $(use_enable profiling)"
179 else 184 else
180 myconf="${myconf} --disable-profiling" 185 myconf="${myconf} --disable-profiling"
181 fi
182 fi 186 fi
183 187
184 # Scan for all available plugins 188 # Scan for all available plugins
185 local plugins_avail="$( 189 local plugins_avail="$(
186 LANG=C \ 190 LANG=C \
217 plugins_sta="${plugins_sta} partition" 221 plugins_sta="${plugins_sta} partition"
218 222
219 if [[ "${PN}" != "mariadb" ]] ; then 223 if [[ "${PN}" != "mariadb" ]] ; then
220 elog "Before using the Federated storage engine, please be sure to read" 224 elog "Before using the Federated storage engine, please be sure to read"
221 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 225 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
222 plugins_dyn="${plugins_sta} federatedx" 226 plugins_dyn="${plugins_dyn} federated"
223 else 227 else
224 elog "MariaDB includes the FederatedX engine. Be sure to read" 228 elog "MariaDB includes the FederatedX engine. Be sure to read"
225 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine" 229 elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
226 plugins_dyn="${plugins_sta} federated" 230 plugins_dyn="${plugins_dyn} federatedx"
227 fi 231 fi
228 else 232 else
229 plugins_dis="${plugins_dis} partition federated" 233 plugins_dis="${plugins_dis} partition federated"
230 fi 234 fi
231 235
238 for i in innodb_plugin ; do 242 for i in innodb_plugin ; do
239 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}" 243 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
240 done 244 done
241 245
242 # like configuration=max-no-ndb 246 # like configuration=max-no-ndb
243 if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then 247 if ( use cluster ) ; then
244 plugins_sta="${plugins_sta} ndbcluster partition" 248 plugins_sta="${plugins_sta} ndbcluster partition"
245 plugins_dis="${plugins_dis//partition}" 249 plugins_dis="${plugins_dis//partition}"
246 myconf="${myconf} --with-ndb-binlog" 250 myconf="${myconf} --with-ndb-binlog"
247 else 251 else
248 plugins_dis="${plugins_dis} ndbcluster" 252 plugins_dis="${plugins_dis} ndbcluster"
287 fi 291 fi
288 fi 292 fi
289 293
290 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then 294 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
291 use pbxt \ 295 use pbxt \
292 && plugins_dyn="${plugins_dyn} pbxt" \ 296 && plugins_sta="${plugins_sta} pbxt" \
293 || plugins_dis="${plugins_dis} pbxt" 297 || plugins_dis="${plugins_dis} pbxt"
294 fi 298 fi
295 299
296 use static && \ 300 use static && \
297 plugins_sta="${plugins_sta} ${plugins_dyn}" && \ 301 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
298 plugins_dyn="" 302 plugins_dyn=""
303
304 # Google MySQL, bundle what upstream supports
305 if [[ "${PN}" == "google-mysql" ]]; then
306 for x in innobase innodb_plugin innodb ; do
307 plugins_sta="${plugins_sta//$x}"
308 plugins_dyn="${plugins_dyn//$x}"
309 done
310 plugins_sta="${plugins_sta} innodb_plugin googlestats"
311 myconf="${myconf} --with-perftools-dir=/usr --enable-perftools-tcmalloc"
312 # use system lzo for google-mysql
313 myconf="${myconf} --with-lzo2-dir=/usr"
314 fi
299 315
300 einfo "Available plugins: ${plugins_avail}" 316 einfo "Available plugins: ${plugins_avail}"
301 einfo "Dynamic plugins: ${plugins_dyn}" 317 einfo "Dynamic plugins: ${plugins_dyn}"
302 einfo "Static plugins: ${plugins_sta}" 318 einfo "Static plugins: ${plugins_sta}"
303 einfo "Disabled plugins: ${plugins_dis}" 319 einfo "Disabled plugins: ${plugins_dis}"
318 334
319 einfo "Reconfiguring dir '${PWD}'" 335 einfo "Reconfiguring dir '${PWD}'"
320 eautoreconf 336 eautoreconf
321 337
322 local myconf="" 338 local myconf=""
323 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 339 myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
324 use debug && myconf="${myconf} --with-debug=full" 340 use debug && myconf="${myconf} --with-debug=full"
325 econf ${myconf} || die "Problem configuring PBXT storage engine" 341 econf ${myconf} || die "Problem configuring PBXT storage engine"
326} 342}
327 343
328pbxt_src_compile() { 344pbxt_src_compile() {
364 380
365 # last -fPIC fixup, per bug #305873 381 # last -fPIC fixup, per bug #305873
366 i="${S}"/storage/innodb_plugin/plug.in 382 i="${S}"/storage/innodb_plugin/plug.in
367 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" 383 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
368 384
369 # Additional checks, remove bundled zlib (Cluster needs this, for static 385 # Additional checks, remove bundled zlib
370 # memory management in zlib, leave available for Cluster)
371 if [[ "${PN}" != "mysql-cluster" ]] ; then
372 rm -f "${S}/zlib/"*.[ch] 386 rm -f "${S}/zlib/"*.[ch]
373 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 387 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
374 fi
375 rm -f "scripts/mysqlbug" 388 rm -f "scripts/mysqlbug"
376 389
377 # Make charsets install in the right place 390 # Make charsets install in the right place
378 find . -name 'Makefile.am' \ 391 find . -name 'Makefile.am' \
379 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 392 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
400 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 413 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
401 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}" 414 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
402 popd >/dev/null 415 popd >/dev/null
403 fi 416 fi
404 417
405 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then 418 if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
406 einfo "Adding storage engine: PBXT" 419 einfo "Adding storage engine: PBXT"
407 pushd "${S}"/storage >/dev/null 420 pushd "${S}"/storage >/dev/null
408 i='pbxt' 421 i='pbxt'
409 [ -d "${i}" ] && rm -rf "${i}" 422 [ -d "${i}" ] && rm -rf "${i}"
410 cp -ral "${WORKDIR}/${PBXT_P}" "${i}" 423 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
424 f="${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
425 [[ -f $f ]] && epatch "$f"
411 popd >/dev/null 426 popd >/dev/null
412 fi 427 fi
413 428
414 rebuilddirlist="." 429 rebuilddirlist="."
415 # This does not seem to be needed presently. robbat2 2010/02/23 430 # This does not seem to be needed presently. robbat2 2010/02/23
458 filter-flags "-fstack-protector-all" 473 filter-flags "-fstack-protector-all"
459 fi 474 fi
460 475
461 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 476 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
462 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 477 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
478 # storage/googlestats, sql/ in google-mysql are using C++ templates
479 # implicitly. Upstream might be interested in this, exclude
480 # -fno-implicit-templates for google-mysql for now.
463 mysql_version_is_at_least "5.0" \ 481 mysql_version_is_at_least "5.0" \
482 && [[ "${PN}" != "google-mysql" ]] \
464 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 483 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
465 export CXXFLAGS 484 export CXXFLAGS
466 485
467 # bug #283926, with GCC4.4, this is required to get correct behavior. 486 # bug #283926, with GCC4.4, this is required to get correct behavior.
468 append-flags -fno-strict-aliasing 487 append-flags -fno-strict-aliasing
475 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \ 494 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
476 append-flags -fno-omit-frame-pointer && \ 495 append-flags -fno-omit-frame-pointer && \
477 filter-flags -fomit-frame-pointer 496 filter-flags -fomit-frame-pointer
478 497
479 econf \ 498 econf \
480 --libexecdir="/usr/sbin" \ 499 --libexecdir="${EPREFIX}/usr/sbin" \
481 --sysconfdir="${MY_SYSCONFDIR}" \ 500 --sysconfdir="${MY_SYSCONFDIR}" \
482 --localstatedir="${MY_LOCALSTATEDIR}" \ 501 --localstatedir="${MY_LOCALSTATEDIR}" \
483 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 502 --sharedstatedir="${MY_SHAREDSTATEDIR}" \
484 --libdir="${MY_LIBDIR}" \ 503 --libdir="${MY_LIBDIR}" \
485 --includedir="${MY_INCLUDEDIR}" \ 504 --includedir="${MY_INCLUDEDIR}" \
537 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 556 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
538 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 557 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
539 558
540 # Various junk (my-*.cnf moved elsewhere) 559 # Various junk (my-*.cnf moved elsewhere)
541 einfo "Removing duplicate /usr/share/mysql files" 560 einfo "Removing duplicate /usr/share/mysql files"
542 rm -Rf "${D}/usr/share/info" 561 rm -Rf "${ED}/usr/share/info"
543 for removeme in "mysql-log-rotate" mysql.server* \ 562 for removeme in "mysql-log-rotate" mysql.server* \
544 binary-configure* my-*.cnf mi_test_all* 563 binary-configure* my-*.cnf mi_test_all*
545 do 564 do
546 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} 565 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
547 done 566 done
548 567
549 # Clean up stuff for a minimal build 568 # Clean up stuff for a minimal build
550 if use minimal ; then 569 if use minimal ; then
551 einfo "Remove all extra content for minimal build" 570 einfo "Remove all extra content for minimal build"
552 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 571 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
553 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} 572 rm -f "${ED}"/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}
554 rm -f "${D}/usr/sbin/mysqld" 573 rm -f "${ED}/usr/sbin/mysqld"
555 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 574 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
556 fi 575 fi
557 576
558 # Unless they explicitly specific USE=test, then do not install the 577 # Unless they explicitly specific USE=test, then do not install the
559 # testsuite. It DOES have a use to be installed, esp. when you want to do a 578 # testsuite. It DOES have a use to be installed, esp. when you want to do a
565 # Configuration stuff 584 # Configuration stuff
566 case ${MYSQL_PV_MAJOR} in 585 case ${MYSQL_PV_MAJOR} in
567 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;; 586 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
568 esac 587 esac
569 einfo "Building default my.cnf (${mysql_mycnf_version})" 588 einfo "Building default my.cnf (${mysql_mycnf_version})"
570 insinto "${MY_SYSCONFDIR}" 589 insinto "${MY_SYSCONFDIR#${EPREFIX}}"
571 doins scripts/mysqlaccess.conf 590 doins scripts/mysqlaccess.conf
572 mycnf_src="my.cnf-${mysql_mycnf_version}" 591 mycnf_src="my.cnf-${mysql_mycnf_version}"
573 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 592 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
593 -e "s!/tmp!${EPREFIX}/tmp!" \
594 -e "s!/usr!${EPREFIX}/usr!" \
595 -e "s!= /var!= ${EPREFIX}/var!" \
574 "${FILESDIR}/${mycnf_src}" \ 596 "${FILESDIR}/${mycnf_src}" \
575 > "${TMPDIR}/my.cnf.ok" 597 > "${TMPDIR}/my.cnf.ok"
576 if use latin1 ; then 598 if use latin1 ; then
577 sed -i \ 599 sed -i \
578 -e "/character-set/s|utf8|latin1|g" \ 600 -e "/character-set/s|utf8|latin1|g" \
579 "${TMPDIR}/my.cnf.ok" 601 "${TMPDIR}/my.cnf.ok"
580 fi 602 fi
603 eprefixify "${TMPDIR}/my.cnf.ok"
581 newins "${TMPDIR}/my.cnf.ok" my.cnf 604 newins "${TMPDIR}/my.cnf.ok" my.cnf
582 605
583 # Minimal builds don't have the MySQL server 606 # Minimal builds don't have the MySQL server
584 if ! use minimal ; then 607 if ! use minimal ; then
585 einfo "Creating initial directories" 608 einfo "Creating initial directories"
586 # Empty directories ... 609 # Empty directories ...
587 diropts "-m0750" 610 diropts "-m0750"
611 keepdir "${MY_DATADIR#${EPREFIX}}"
588 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 612 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
589 dodir "${MY_DATADIR}"
590 keepdir "${MY_DATADIR}"
591 chown -R mysql:mysql "${D}/${MY_DATADIR}" 613 chown -R mysql:mysql "${D}/${MY_DATADIR}"
592 fi 614 fi
593 615
594 diropts "-m0755" 616 diropts "-m0755"
595 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 617 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
596 dodir "${folder}" 618 dodir "${folder}"
597 keepdir "${folder}" 619 keepdir "${folder}"
598 chown -R mysql:mysql "${D}/${folder}" 620 chown -R mysql:mysql "${ED}/${folder}"
599 done 621 done
600 fi 622 fi
601 623
602 # Docs 624 # Docs
603 einfo "Installing docs" 625 einfo "Installing docs"
623 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 645 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
624 done 646 done
625 647
626 fi 648 fi
627 649
628 mysql_lib_symlinks "${D}" 650 mysql_lib_symlinks "${ED}"
629} 651}

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.14

  ViewVC Help
Powered by ViewVC 1.1.20