Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
Date: Sat, 29 Nov 2008 02:30:47
Message-Id: E1L6FbY-0006hS-5A@stork.gentoo.org
1 robbat2 08/11/29 02:30:44
2
3 Modified: mysql.eclass
4 Log:
5 Move the hostname==localhost check from pkg_setup to pkg_config and src_test instead, to enable building in binpkg hosts more easily.
6
7 Revision Changes Path
8 1.102 eclass/mysql.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.102&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.102&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.101&r2=1.102
13
14 Index: mysql.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
17 retrieving revision 1.101
18 retrieving revision 1.102
19 diff -p -w -b -B -u -u -r1.101 -r1.102
20 --- mysql.eclass 20 Nov 2008 20:44:33 -0000 1.101
21 +++ mysql.eclass 29 Nov 2008 02:30:43 -0000 1.102
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2007 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.101 2008/11/20 20:44:33 robbat2 Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.102 2008/11/29 02:30:43 robbat2 Exp $
27
28 # Author: Francesco Riosa (Retired) <vivo@g.o>
29 # Maintainer: MySQL Team <mysql-bugs@g.o>
30 @@ -493,10 +493,6 @@ mysql_pkg_setup() {
31 fi
32 fi
33
34 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
35 - # localhost. Also causes weird failures.
36 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
37 -
38 # Check for USE flag problems in pkg_setup
39 if use static && use ssl ; then
40 eerror "MySQL does not support being built statically with SSL support enabled!"
41 @@ -852,6 +848,10 @@ mysql_pkg_config() {
42 die "MySQL database already exists!"
43 fi
44
45 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
46 + # localhost. Also causes weird failures.
47 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
48 +
49 einfo "Creating the mysql database and setting proper"
50 einfo "permissions on it ..."