/[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.18 Revision 1.19
1# Copyright 1999-2013 Gentoo Foundation 1# Copyright 1999-2014 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.18 2013/06/26 19:31:49 jmbsvicetto Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.19 2014/07/19 10:18:41 grobian 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>
110mysql-autotools_configure_common() { 110mysql-autotools_configure_common() {
111 111
112 myconf="${myconf} $(use_with big-tables)" 112 myconf="${myconf} $(use_with big-tables)"
113 myconf="${myconf} --enable-local-infile" 113 myconf="${myconf} --enable-local-infile"
114 myconf="${myconf} --with-extra-charsets=all" 114 myconf="${myconf} --with-extra-charsets=all"
115 myconf="${myconf} --with-mysqld-user=mysql" 115 use prefix || myconf="${myconf} --with-mysqld-user=mysql"
116 myconf="${myconf} --with-server" 116 myconf="${myconf} --with-server"
117 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock" 117 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
118 myconf="${myconf} --without-libwrap" 118 myconf="${myconf} --without-libwrap"
119 119
120 if use static ; then 120 if use static ; then
604 -e "s!/tmp!${EPREFIX}/tmp!" \ 604 -e "s!/tmp!${EPREFIX}/tmp!" \
605 -e "s!/usr!${EPREFIX}/usr!" \ 605 -e "s!/usr!${EPREFIX}/usr!" \
606 -e "s!= /var!= ${EPREFIX}/var!" \ 606 -e "s!= /var!= ${EPREFIX}/var!" \
607 "${FILESDIR}/${mycnf_src}" \ 607 "${FILESDIR}/${mycnf_src}" \
608 > "${TMPDIR}/my.cnf.ok" 608 > "${TMPDIR}/my.cnf.ok"
609 use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
609 if use latin1 ; then 610 if use latin1 ; then
610 sed -i \ 611 sed -i \
611 -e "/character-set/s|utf8|latin1|g" \ 612 -e "/character-set/s|utf8|latin1|g" \
612 "${TMPDIR}/my.cnf.ok" 613 "${TMPDIR}/my.cnf.ok"
613 fi 614 fi

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

  ViewVC Help
Powered by ViewVC 1.1.20