/[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.10 Revision 1.18
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2013 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/Attic/mysql-autotools.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql-autotools.eclass,v 1.18 2013/06/26 19:31:49 jmbsvicetto Exp $
4 4
5# @ECLASS: mysql-autotools.eclass 5# @ECLASS: mysql-autotools.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# MySQL Team <mysql-bugs@gentoo.org> 7# MySQL Team <mysql-bugs@gentoo.org>
8# Robin H. Johnson <robbat2@gentoo.org> 8# Robin H. Johnson <robbat2@gentoo.org>
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 flag-o-matic multilib 20inherit autotools flag-o-matic multilib prefix
21 21
22# 22#
23# HELPER FUNCTIONS: 23# HELPER FUNCTIONS:
24# 24#
25 25
49 # ${S}/mysql-tests/suite/parts/t/disabled.def 49 # ${S}/mysql-tests/suite/parts/t/disabled.def
50 # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def 50 # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
51 # ${S}/mysql-tests/suite/ndb_team/t/disabled.def 51 # ${S}/mysql-tests/suite/ndb_team/t/disabled.def
52 # ${S}/mysql-tests/suite/binlog/t/disabled.def 52 # ${S}/mysql-tests/suite/binlog/t/disabled.def
53 # ${S}/mysql-tests/suite/innodb/t/disabled.def 53 # ${S}/mysql-tests/suite/innodb/t/disabled.def
54 if [ -n "${testsuite}" ]; then 54 if [[ -n ${testsuite} ]]; then
55 for mysql_disable_file in \ 55 for mysql_disable_file in \
56 ${S}/mysql-test/suite/${testsuite}/disabled.def \ 56 ${S}/mysql-test/suite/${testsuite}/disabled.def \
57 ${S}/mysql-test/suite/${testsuite}/t/disabled.def \ 57 ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
58 FAILED ; do 58 FAILED ; do
59 [ -f "${mysql_disable_file}" ] && break 59 [[ -f ${mysql_disable_file} ]] && break
60 done 60 done
61 if [ "${mysql_disabled_file}" != "FAILED" ]; then 61 if [[ ${mysql_disabled_file} != "FAILED" ]]; then
62 echo "${testname} : ${reason}" >> "${mysql_disable_file}" 62 echo "${testname} : ${reason}" >> "${mysql_disable_file}"
63 else 63 else
64 ewarn "Could not find testsuite disabled.def location for ${rawtestname}" 64 ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
65 fi 65 fi
66 fi 66 fi
97 myconf="${myconf} --with-collation=latin1_swedish_ci" 97 myconf="${myconf} --with-collation=latin1_swedish_ci"
98 fi 98 fi
99 99
100 # MariaDB requires this flag in order to link to GPLv3 readline v6 or greater 100 # MariaDB requires this flag in order to link to GPLv3 readline v6 or greater
101 # A note is added to the configure output 101 # A note is added to the configure output
102 if [[ "${PN}" == "mariadb" ]] && mysql_version_is_at_least "5.1.61" ; then 102 if [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.1.61" ; then
103 myconf="${myconf} --disable-distribution" 103 myconf="${myconf} --disable-distribution"
104 fi 104 fi
105} 105}
106 106
107# @FUNCTION: mysql-autotools_configure_common 107# @FUNCTION: mysql-autotools_configure_common
132 if ( use cluster ); then 132 if ( use cluster ); then
133 myconf="${myconf} --without-ndb-debug" 133 myconf="${myconf} --without-ndb-debug"
134 fi 134 fi
135 fi 135 fi
136 136
137 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then 137 if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
138 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" 138 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
139 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." 139 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
140 ewarn "You MUST file bugs without these variables set." 140 ewarn "You MUST file bugs without these variables set."
141 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}" 141 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
142 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}" 142 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
218 # like configuration=max-no-ndb, archive and example removed in 5.1.11 218 # like configuration=max-no-ndb, archive and example removed in 5.1.11
219 # not added yet: ibmdb2i 219 # not added yet: ibmdb2i
220 # Not supporting as examples: example,daemon_example,ftexample 220 # Not supporting as examples: example,daemon_example,ftexample
221 plugins_sta="${plugins_sta} partition" 221 plugins_sta="${plugins_sta} partition"
222 222
223 if [[ "${PN}" != "mariadb" ]] ; then 223 if [[ ${PN} != "mariadb" ]] ; then
224 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"
225 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"
226 plugins_dyn="${plugins_dyn} federated" 226 plugins_dyn="${plugins_dyn} federated"
227 else 227 else
228 elog "MariaDB includes the FederatedX engine. Be sure to read" 228 elog "MariaDB includes the FederatedX engine. Be sure to read"
235 235
236 # Upstream specifically requests that InnoDB always be built: 236 # Upstream specifically requests that InnoDB always be built:
237 # - innobase, innodb_plugin 237 # - innobase, innodb_plugin
238 # Build falcon if available for 6.x series. 238 # Build falcon if available for 6.x series.
239 for i in innobase falcon ; do 239 for i in innobase falcon ; do
240 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}" 240 [[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}"
241 done 241 done
242 for i in innodb_plugin ; do 242 for i in innodb_plugin ; do
243 [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}" 243 [[ -e ${S}/storage/${i} ]] && plugins_dyn="${plugins_dyn} ${i}"
244 done 244 done
245 245
246 # like configuration=max-no-ndb 246 # like configuration=max-no-ndb
247 if ( use cluster ) ; then 247 if ( use cluster ) ; then
248 plugins_sta="${plugins_sta} ndbcluster partition" 248 plugins_sta="${plugins_sta} ndbcluster partition"
250 myconf="${myconf} --with-ndb-binlog" 250 myconf="${myconf} --with-ndb-binlog"
251 else 251 else
252 plugins_dis="${plugins_dis} ndbcluster" 252 plugins_dis="${plugins_dis} ndbcluster"
253 fi 253 fi
254 254
255 if [[ "${PN}" == "mariadb" ]] ; then 255 if [[ ${PN} == "mariadb" ]] ; then
256 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not 256 # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
257 # caught above. 257 # caught above.
258 # This is not optional, without it several upstream testcases fail. 258 # This is not optional, without it several upstream testcases fail.
259 # Also strongly recommended by upstream. 259 # Also strongly recommended by upstream.
260 if [[ "${PV}" < "5.2.0" ]] ; then 260 if [[ ${PV} < "5.2.0" ]] ; then
261 myconf="${myconf} --with-maria-tmp-tables" 261 myconf="${myconf} --with-maria-tmp-tables"
262 plugins_sta="${plugins_sta} maria" 262 plugins_sta="${plugins_sta} maria"
263 else 263 else
264 myconf="${myconf} --with-aria-tmp-tables" 264 myconf="${myconf} --with-aria-tmp-tables"
265 plugins_sta="${plugins_sta} aria" 265 plugins_sta="${plugins_sta} aria"
266 fi 266 fi
267 267
268 [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] || 268 [[ ( -e ${S}/storage/innobase ) || ( -e ${S}/storage/xtradb ) ]] ||
269 die "The ${P} package doesn't provide innobase nor xtradb" 269 die "The ${P} package doesn't provide innobase nor xtradb"
270 270
271 for i in innobase xtradb ; do 271 for i in innobase xtradb ; do
272 [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}" 272 [[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}"
273 done 273 done
274 274
275 myconf="${myconf} $(use_with libevent)" 275 myconf="${myconf} $(use_with libevent)"
276 276
277 if mysql_version_is_at_least "5.2" ; then 277 if mysql_version_is_at_least "5.2" ; then
287 use ${i} \ 287 use ${i} \
288 && plugins_dyn="${plugins_dyn} ${i}" \ 288 && plugins_dyn="${plugins_dyn} ${i}" \
289 || plugins_dis="${plugins_dis} ${i}" 289 || plugins_dis="${plugins_dis} ${i}"
290 done 290 done
291 fi 291 fi
292
293 #Authentication plugins
294 if mysql_version_is_at_least "5.2.11" ; then
295 for i in pam ; do
296 use ${i} \
297 && plugins_dyn="${plugins_dyn} auth_${i}" \
298 || plugins_dis="${plugins_dis} auth_${i}"
299 done
292 fi 300 fi
301 fi
293 302
294 if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then 303 if pbxt_available && [[ ${PBXT_NEWSTYLE} == "1" ]]; then
295 use pbxt \ 304 use pbxt \
296 && plugins_sta="${plugins_sta} pbxt" \ 305 && plugins_sta="${plugins_sta} pbxt" \
297 || plugins_dis="${plugins_dis} pbxt" 306 || plugins_dis="${plugins_dis} pbxt"
298 fi 307 fi
299 308
300 use static && \ 309 use static && \
301 plugins_sta="${plugins_sta} ${plugins_dyn}" && \ 310 plugins_sta="${plugins_sta} ${plugins_dyn}" && \
302 plugins_dyn="" 311 plugins_dyn=""
312
313 # Google MySQL, bundle what upstream supports
314 if [[ ${PN} == "google-mysql" ]]; then
315 for x in innobase innodb_plugin innodb ; do
316 plugins_sta="${plugins_sta//$x}"
317 plugins_dyn="${plugins_dyn//$x}"
318 done
319 plugins_sta="${plugins_sta} innodb_plugin googlestats"
320 myconf="${myconf} --with-perftools-dir=/usr --enable-perftools-tcmalloc"
321 # use system lzo for google-mysql
322 myconf="${myconf} --with-lzo2-dir=/usr"
323 fi
303 324
304 einfo "Available plugins: ${plugins_avail}" 325 einfo "Available plugins: ${plugins_avail}"
305 einfo "Dynamic plugins: ${plugins_dyn}" 326 einfo "Dynamic plugins: ${plugins_dyn}"
306 einfo "Static plugins: ${plugins_sta}" 327 einfo "Static plugins: ${plugins_sta}"
307 einfo "Disabled plugins: ${plugins_dis}" 328 einfo "Disabled plugins: ${plugins_dis}"
366 # And apply 387 # And apply
367 epatch 388 epatch
368 389
369 # last -fPIC fixup, per bug #305873 390 # last -fPIC fixup, per bug #305873
370 i="${S}"/storage/innodb_plugin/plug.in 391 i="${S}"/storage/innodb_plugin/plug.in
371 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" 392 [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
372 393
373 # Additional checks, remove bundled zlib 394 # Additional checks, remove bundled zlib
374 rm -f "${S}/zlib/"*.[ch] 395 rm -f "${S}/zlib/"*.[ch]
375 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 396 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
376 rm -f "scripts/mysqlbug" 397 rm -f "scripts/mysqlbug"
394 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)" 415 einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
395 pushd "${S}"/storage >/dev/null 416 pushd "${S}"/storage >/dev/null
396 i="innobase" 417 i="innobase"
397 o="${WORKDIR}/storage-${i}.mysql-upstream" 418 o="${WORKDIR}/storage-${i}.mysql-upstream"
398 # Have we been here already? 419 # Have we been here already?
399 [ -d "${o}" ] && rm -f "${i}" 420 [[ -d ${o} ]] && rm -f "${i}"
400 # Or maybe we haven't 421 # Or maybe we haven't
401 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" 422 [[ ( -d ${i} ) && ! ( -d ${o} ) ]] && mv "${i}" "${o}"
402 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}" 423 cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
403 popd >/dev/null 424 popd >/dev/null
404 fi 425 fi
405 426
406 if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then 427 if pbxt_patch_available && [[ ${PBXT_NEWSTYLE} == "1" ]] && use pbxt ; then
407 einfo "Adding storage engine: PBXT" 428 einfo "Adding storage engine: PBXT"
408 pushd "${S}"/storage >/dev/null 429 pushd "${S}"/storage >/dev/null
409 i='pbxt' 430 i='pbxt'
410 [ -d "${i}" ] && rm -rf "${i}" 431 [[ -d ${i} ]] && rm -rf "${i}"
411 cp -ral "${WORKDIR}/${PBXT_P}" "${i}" 432 cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
433 f="${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch"
434 [[ -f $f ]] && epatch "$f"
412 popd >/dev/null 435 popd >/dev/null
413 fi 436 fi
414 437
415 rebuilddirlist="." 438 rebuilddirlist="."
416 # This does not seem to be needed presently. robbat2 2010/02/23 439 # This does not seem to be needed presently. robbat2 2010/02/23
431 454
432# @FUNCTION: mysql-autotools_src_configure 455# @FUNCTION: mysql-autotools_src_configure
433# @DESCRIPTION: 456# @DESCRIPTION:
434# Configure mysql to build the code for Gentoo respecting the use flags. 457# Configure mysql to build the code for Gentoo respecting the use flags.
435mysql-autotools_src_configure() { 458mysql-autotools_src_configure() {
459 # bug 401733
460 export QA_CONFIGURE_OPTIONS=".*"
436 461
437 # Make sure the vars are correctly initialized 462 # Make sure the vars are correctly initialized
438 mysql_init_vars 463 mysql_init_vars
439 464
440 # $myconf is modified by the configure_* functions 465 # $myconf is modified by the configure_* functions
449 474
450 # Bug #114895, bug #110149 475 # Bug #114895, bug #110149
451 filter-flags "-O" "-O[01]" 476 filter-flags "-O" "-O[01]"
452 477
453 # glib-2.3.2_pre fix, bug #16496 478 # glib-2.3.2_pre fix, bug #16496
454 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 479 append-cppflags "-DHAVE_ERRNO_AS_DEFINE=1"
455 480
456 # As discovered by bug #246652, doing a double-level of SSP causes NDB to 481 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
457 # fail badly during cluster startup. 482 # fail badly during cluster startup.
458 if [[ $(gcc-major-version) -lt 4 ]]; then 483 if [[ $(gcc-major-version) -lt 4 ]]; then
459 filter-flags "-fstack-protector-all" 484 filter-flags "-fstack-protector-all"
460 fi 485 fi
461 486
462 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 487 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
463 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 488 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
489 # storage/googlestats, sql/ in google-mysql are using C++ templates
490 # implicitly. Upstream might be interested in this, exclude
491 # -fno-implicit-templates for google-mysql for now.
464 mysql_version_is_at_least "5.0" \ 492 mysql_version_is_at_least "5.0" \
493 && [[ ${PN} != "google-mysql" ]] \
465 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 494 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
466 export CXXFLAGS 495 export CXXFLAGS
467 496
468 # bug #283926, with GCC4.4, this is required to get correct behavior. 497 # bug #283926, with GCC4.4, this is required to get correct behavior.
469 append-flags -fno-strict-aliasing 498 append-flags -fno-strict-aliasing
495 # TODO: Move this before autoreconf !!! 524 # TODO: Move this before autoreconf !!!
496 find . -type f -name Makefile -print0 \ 525 find . -type f -name Makefile -print0 \
497 | xargs -0 -n100 sed -i \ 526 | xargs -0 -n100 sed -i \
498 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 527 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
499 528
500 if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then 529 if [[ $EAPI == 2 ]] && [[ ${PBXT_NEWSTYLE} != "1" ]]; then
501 pbxt_patch_available && use pbxt && pbxt_src_configure 530 pbxt_patch_available && use pbxt && pbxt_src_configure
502 fi 531 fi
503} 532}
504 533
505# @FUNCTION: mysql-autotools_src_compile 534# @FUNCTION: mysql-autotools_src_compile
507# Compile the mysql code. 536# Compile the mysql code.
508mysql-autotools_src_compile() { 537mysql-autotools_src_compile() {
509 538
510 emake || die "emake failed" 539 emake || die "emake failed"
511 540
512 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then 541 if [[ ${PBXT_NEWSTYLE} != "1" ]]; then
513 pbxt_patch_available && use pbxt && pbxt_src_compile 542 pbxt_patch_available && use pbxt && pbxt_src_compile
514 fi 543 fi
515} 544}
516 545
517# @FUNCTION: mysql-autotools_src_install 546# @FUNCTION: mysql-autotools_src_install
526 DESTDIR="${D}" \ 555 DESTDIR="${D}" \
527 benchdir_root="${MY_SHAREDSTATEDIR}" \ 556 benchdir_root="${MY_SHAREDSTATEDIR}" \
528 testroot="${MY_SHAREDSTATEDIR}" \ 557 testroot="${MY_SHAREDSTATEDIR}" \
529 || die "emake install failed" 558 || die "emake install failed"
530 559
531 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then 560 if [[ ${PBXT_NEWSTYLE} != "1" ]]; then
532 pbxt_patch_available && use pbxt && pbxt_src_install 561 pbxt_patch_available && use pbxt && pbxt_src_install
533 fi 562 fi
534 563
535 # Convenience links 564 # Convenience links
536 einfo "Making Convenience links for mysqlcheck multi-call binary" 565 einfo "Making Convenience links for mysqlcheck multi-call binary"
580 if use latin1 ; then 609 if use latin1 ; then
581 sed -i \ 610 sed -i \
582 -e "/character-set/s|utf8|latin1|g" \ 611 -e "/character-set/s|utf8|latin1|g" \
583 "${TMPDIR}/my.cnf.ok" 612 "${TMPDIR}/my.cnf.ok"
584 fi 613 fi
614 eprefixify "${TMPDIR}/my.cnf.ok"
585 newins "${TMPDIR}/my.cnf.ok" my.cnf 615 newins "${TMPDIR}/my.cnf.ok" my.cnf
586 616
587 # Minimal builds don't have the MySQL server 617 # Minimal builds don't have the MySQL server
588 if ! use minimal ; then 618 if ! use minimal ; then
589 einfo "Creating initial directories" 619 einfo "Creating initial directories"
590 # Empty directories ... 620 # Empty directories ...
591 diropts "-m0750" 621 diropts "-m0750"
592 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
593 dodir "${MY_DATADIR#${EPREFIX}}"
594 keepdir "${MY_DATADIR#${EPREFIX}}" 622 keepdir "${MY_DATADIR#${EPREFIX}}"
623 if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
595 chown -R mysql:mysql "${D}/${MY_DATADIR}" 624 chown -R mysql:mysql "${D}/${MY_DATADIR}"
596 fi 625 fi
597 626
598 diropts "-m0755" 627 diropts "-m0755"
599 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do 628 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
604 fi 633 fi
605 634
606 # Docs 635 # Docs
607 einfo "Installing docs" 636 einfo "Installing docs"
608 for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do 637 for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
609 [[ -f "$i" ]] && dodoc "$i" 638 [[ -f $i ]] && dodoc "$i"
610 done 639 done
611 doinfo "${S}"/Docs/mysql.info 640 doinfo "${S}"/Docs/mysql.info
612 641
613 # Minimal builds don't have the MySQL server 642 # Minimal builds don't have the MySQL server
614 if ! use minimal ; then 643 if ! use minimal ; then
617 for script in \ 646 for script in \
618 "${S}"/support-files/my-*.cnf \ 647 "${S}"/support-files/my-*.cnf \
619 "${S}"/support-files/magic \ 648 "${S}"/support-files/magic \
620 "${S}"/support-files/ndb-config-2-node.ini 649 "${S}"/support-files/ndb-config-2-node.ini
621 do 650 do
622 [[ -f "$script" ]] && dodoc "${script}" 651 [[ -f $script ]] && dodoc "${script}"
623 done 652 done
624 653
625 docinto "scripts" 654 docinto "scripts"
626 for script in "${S}"/scripts/mysql* ; do 655 for script in "${S}"/scripts/mysql* ; do
627 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 656 [[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
628 done 657 done
629 658
630 fi 659 fi
631 660
632 mysql_lib_symlinks "${ED}" 661 mysql_lib_symlinks "${ED}"
662
663 #Remove mytop if perl is not selected
664 [[ ${PN} == "mariadb" ]] && ! use perl \
665 && mysql_version_is_at_least "5.3" \
666 && rm -f "${ED}/usr/bin/mytop"
667
668 #Bug 455462 remove unnecessary libtool files
669 prune_libtool_files --modules
633} 670}

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.18

  ViewVC Help
Powered by ViewVC 1.1.20