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

Diff of /eclass/mysql.eclass

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

Revision 1.70 Revision 1.72
1# Copyright 1999-2007 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.70 2007/01/12 23:33:19 chtekk Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.72 2007/03/16 22:47:29 chtekk Exp $
4 4
5# Author: Francesco Riosa (Retired) <vivo@gentoo.org> 5# Author: Francesco Riosa (Retired) <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!
524 if mysql_version_is_at_least "5.1.12" ; then 524 if mysql_version_is_at_least "5.1.12" ; then
525 rebuilddirlist="." 525 rebuilddirlist="."
526 # TODO: check this with a cmake expert 526 # TODO: check this with a cmake expert
527 use innodb \ 527 use innodb \
528 && cmake \ 528 && cmake \
529 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 529 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
530 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 530 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \
531 "storage/innobase" 531 "storage/innobase"
532 else 532 else
533 rebuilddirlist=". innobase" 533 rebuilddirlist=". innobase"
534 fi 534 fi
535 535
541 done 541 done
542 542
543 if mysql_check_version_range "4.1 to 5.0.99.99" \ 543 if mysql_check_version_range "4.1 to 5.0.99.99" \
544 && use berkdb ; then 544 && use berkdb ; then
545 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 545 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
546 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
547 || die "Could not copy libtool.m4 to bdb/dist/"
546 pushd "bdb/dist" \ 548 pushd "bdb/dist" &>/dev/null
547 && sh s_all \ 549 sh s_all \
548 || die "Failed bdb reconfigure" \ 550 || die "Failed bdb reconfigure"
549 &>/dev/null
550 popd &>/dev/null 551 popd &>/dev/null
551 fi 552 fi
552} 553}
553 554
554mysql_src_compile() { 555mysql_src_compile() {

Legend:
Removed from v.1.70  
changed lines
  Added in v.1.72

  ViewVC Help
Powered by ViewVC 1.1.20