* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2007-10-02 10:00 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2007-10-02 10:00 UTC (permalink / raw
To: gentoo-commits
robbat2 07/10/02 10:00:07
Modified: mysql.eclass
Log:
Fix typo with CXX compiler.
Revision Changes Path
1.82 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.81&r2=1.82
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mysql.eclass 15 Jul 2007 00:22:13 -0000 1.81
+++ mysql.eclass 2 Oct 2007 10:00:07 -0000 1.82
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.81 2007/07/15 00:22:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.82 2007/10/02 10:00:07 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: Luca Longinotti <chtekk@gentoo.org>
@@ -538,7 +538,7 @@
use innodb \
&& cmake \
-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
- -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCC)) \
+ -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
"storage/innobase"
else
rebuilddirlist=". innobase"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2007-11-08 9:42 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2007-11-08 9:42 UTC (permalink / raw
To: gentoo-commits
robbat2 07/11/08 09:42:56
Modified: mysql.eclass
Log:
Add the FEATURES=-userpriv die so that testing fails earlier than src_test.
Revision Changes Path
1.83 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.82&r2=1.83
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mysql.eclass 2 Oct 2007 10:00:07 -0000 1.82
+++ mysql.eclass 8 Nov 2007 09:42:55 -0000 1.83
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.82 2007/10/02 10:00:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.83 2007/11/08 09:42:55 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: Luca Longinotti <chtekk@gentoo.org>
@@ -455,8 +455,13 @@
#
mysql_pkg_setup() {
- enewgroup mysql 60 || die "problem adding 'mysql' group"
- enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+ if hasq test ${FEATURES} ; then
+ if ! use minimal ; then
+ if ! hasq userpriv ${FEATURES} ; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream"
+ fi
+ fi
+ fi
# Check for USE flag problems in pkg_setup
if use static && use ssl ; then
@@ -478,6 +483,10 @@
eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
fi
+
+ # This should come after all of the die statements
+ enewgroup mysql 60 || die "problem adding 'mysql' group"
+ enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
mysql_check_version_range "4.0 to 5.0.99.99" \
&& use berkdb \
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-01-16 4:01 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-01-16 4:01 UTC (permalink / raw
To: gentoo-commits
robbat2 08/01/16 04:01:14
Modified: mysql.eclass
Log:
Use --without-readline when building the minimal version as so not to use the bundled old readline, per bug #192149.
Revision Changes Path
1.84 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.83&r2=1.84
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -p -w -b -B -u -u -r1.83 -r1.84
--- mysql.eclass 8 Nov 2007 09:42:55 -0000 1.83
+++ mysql.eclass 16 Jan 2008 04:01:14 -0000 1.84
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.83 2007/11/08 09:42:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.84 2008/01/16 04:01:14 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: Luca Longinotti <chtekk@gentoo.org>
@@ -251,7 +251,7 @@ configure_minimal() {
# These are things we exclude from a minimal build, please
# note that the server actually does get built and installed,
# but we then delete it before packaging.
- local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication"
+ local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
for i in ${minimal_exclude_list} ; do
myconf="${myconf} --without-${i}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-03-09 21:09 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-03-09 21:09 UTC (permalink / raw
To: gentoo-commits
robbat2 08/03/09 21:09:24
Modified: mysql.eclass
Log:
Catch failures of the mysql_install_db call.
Revision Changes Path
1.85 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.84&r2=1.85
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -p -w -b -B -u -u -r1.84 -r1.85
--- mysql.eclass 16 Jan 2008 04:01:14 -0000 1.84
+++ mysql.eclass 9 Mar 2008 21:09:23 -0000 1.85
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.84 2008/01/16 04:01:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.85 2008/03/09 21:09:23 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: Luca Longinotti <chtekk@gentoo.org>
@@ -821,7 +821,11 @@ mysql_pkg_config() {
help_tables="${TMPDIR}/fill_help_tables.sql"
pushd "${TMPDIR}" &>/dev/null
- "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR"
+ "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
+ if [ $? -ne 0 ]; then
+ grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+ die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ fi
popd &>/dev/null
[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
|| die "MySQL databases not installed"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-03-09 21:13 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-03-09 21:13 UTC (permalink / raw
To: gentoo-commits
robbat2 08/03/09 21:13:22
Modified: mysql.eclass
Log:
Forcibly redo the patches every unpack, and also add support for grabbing them straight from the Git overlay, to speed up testing.
Revision Changes Path
1.86 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.85&r2=1.86
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -p -w -b -B -u -u -r1.85 -r1.86
--- mysql.eclass 9 Mar 2008 21:09:23 -0000 1.85
+++ mysql.eclass 9 Mar 2008 21:13:22 -0000 1.86
@@ -1,12 +1,11 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.85 2008/03/09 21:09:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.86 2008/03/09 21:13:22 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
-# Maintainer: Luca Longinotti <chtekk@gentoo.org>
-
-# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too!
-# Note that MYSQL_VERSION_ID must be empty!
+# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
+# - Luca Longinotti <chtekk@gentoo.org>
+# - Robin H. Johnson <robbat2@gentoo.org>
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
@@ -18,6 +17,10 @@ inherit eutils flag-o-matic gnuconfig au
S="${WORKDIR}/mysql"
[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108"
+if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+ inherit git
+fi
if [[ ${PR#r} -lt 60 ]] ; then
IS_BITKEEPER=0
@@ -81,7 +84,9 @@ if [ -z "${SERVER_URI}" ]; then
fi
# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}
+SRC_URI="${SERVER_URI}"
+
+[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
mysql_version_is_at_least "5.1.12" \
@@ -497,6 +502,9 @@ mysql_src_unpack() {
mysql_init_vars
unpack ${A}
+ # Grab the patches
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
+ # Bitkeeper checkout support
if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
if mysql_check_version_range "5.1 to 5.1.99" ; then
bitkeeper_fetch "mysql-5.1-ndb"
@@ -516,7 +524,11 @@ mysql_src_unpack() {
# Apply the patches for this MySQL version
EPATCH_SUFFIX="patch"
mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
+ # Clean out old items
+ rm -f "${EPATCH_SOURCE}"/*
+ # Now link in right patches
mysql_mv_patches
+ # And apply
epatch
# Additional checks, remove bundled zlib
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-03-09 21:19 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-03-09 21:19 UTC (permalink / raw
To: gentoo-commits
robbat2 08/03/09 21:19:14
Modified: mysql.eclass
Log:
Make sure $DISTDIR/git-src/mysql-extras is used for the patchset copy.
Revision Changes Path
1.87 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.86&r2=1.87
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -p -w -b -B -u -u -r1.86 -r1.87
--- mysql.eclass 9 Mar 2008 21:13:22 -0000 1.86
+++ mysql.eclass 9 Mar 2008 21:19:14 -0000 1.87
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.86 2008/03/09 21:13:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.87 2008/03/09 21:19:14 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -18,6 +18,7 @@ S="${WORKDIR}/mysql"
[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108"
if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
+ EGIT_PROJECT=mysql-extras
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
inherit git
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-03-10 2:47 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-03-10 2:47 UTC (permalink / raw
To: gentoo-commits
robbat2 08/03/10 02:47:21
Modified: mysql.eclass
Log:
Trim the trailing letters used by upstream for respun tarballs.
Revision Changes Path
1.88 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.87&r2=1.88
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -p -w -b -B -u -u -r1.87 -r1.88
--- mysql.eclass 9 Mar 2008 21:19:14 -0000 1.87
+++ mysql.eclass 10 Mar 2008 02:47:20 -0000 1.88
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.87 2008/03/09 21:19:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.88 2008/03/10 02:47:20 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -36,9 +36,11 @@ fi
# This is an important part, because many of the choices the MySQL ebuild will do
# depend on this variable.
# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
+# We also strip off upstream's trailing letter that they use to respin tarballs
MYSQL_VERSION_ID=""
-tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+tpv="${PV%[a-z]}"
+tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
for vatom in 0 1 2 3 ; do
# pad to length 2
tpv[${vatom}]="00${tpv[${vatom}]}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-04-05 0:43 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-04-05 0:43 UTC (permalink / raw
To: gentoo-commits
robbat2 08/04/05 00:43:26
Modified: mysql.eclass
Log:
Use the last instance of datadir if we fall to manually processing.
Revision Changes Path
1.89 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.88&r2=1.89
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -p -w -b -B -u -u -r1.88 -r1.89
--- mysql.eclass 10 Mar 2008 02:47:20 -0000 1.88
+++ mysql.eclass 5 Apr 2008 00:43:26 -0000 1.89
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.88 2008/03/10 02:47:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.89 2008/04/05 00:43:26 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -226,7 +226,8 @@ mysql_init_vars() {
| tail -n1`
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
- | sed -e 's/.*=\s*//'`
+ | sed -e 's/.*=\s*//' \
+ | tail -n1`
fi
fi
if [[ -z "${MY_DATADIR}" ]] ; then
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-05-22 18:13 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-05-22 18:13 UTC (permalink / raw
To: gentoo-commits
robbat2 08/05/22 18:13:34
Modified: mysql.eclass
Log:
Take cmake, ed, bk_client out of RDEPEND for building mysql.
Revision Changes Path
1.90 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.89&r2=1.90
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -p -w -b -B -u -u -r1.89 -r1.90
--- mysql.eclass 5 Apr 2008 00:43:26 -0000 1.89
+++ mysql.eclass 22 May 2008 18:13:33 -0000 1.90
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.89 2008/04/05 00:43:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.90 2008/05/22 18:13:33 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -50,6 +50,7 @@ done
MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
userland_GNU? ( sys-process/procps )
>=sys-apps/sed-4
@@ -63,18 +64,25 @@ for i in "" "-community" ; do
DEPEND="${DEPEND} !dev-db/mysql${i}"
done
+RDEPEND="${DEPEND}
+ !minimal? ( dev-db/mysql-init-scripts )
+ selinux? ( sec-policy/selinux-mysql )"
+
+# compile-time-only
mysql_version_is_at_least "5.1" \
|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
+# compile-time-only
mysql_version_is_at_least "5.1.12" \
&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
# BitKeeper dependency, compile-time only
[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
+
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
# Work out the default SERVER_URI correctly
if [ -z "${SERVER_URI}" ]; then
# The community build is on the mirrors
@@ -123,10 +131,6 @@ mysql_version_is_at_least "5.1" \
mysql_version_is_at_least "5.1.12" \
&& IUSE="${IUSE} pbxt"
-RDEPEND="${DEPEND}
- !minimal? ( dev-db/mysql-init-scripts )
- selinux? ( sec-policy/selinux-mysql )"
-
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
pkg_postinst pkg_config pkg_postrm
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-05-29 3:15 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-05-29 3:15 UTC (permalink / raw
To: gentoo-commits
robbat2 08/05/29 03:15:12
Modified: mysql.eclass
Log:
Bug #187024. Test for what user we are instead of FEATURES=userpriv. MySQL tests WILL fail if we are root.
Revision Changes Path
1.91 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.90&r2=1.91
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -p -w -b -B -u -u -r1.90 -r1.91
--- mysql.eclass 22 May 2008 18:13:33 -0000 1.90
+++ mysql.eclass 29 May 2008 03:15:12 -0000 1.91
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.90 2008/05/22 18:13:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.91 2008/05/29 03:15:12 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -469,8 +469,8 @@ pbxt_src_install() {
mysql_pkg_setup() {
if hasq test ${FEATURES} ; then
if ! use minimal ; then
- if ! hasq userpriv ${FEATURES} ; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream"
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
fi
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-05-29 5:17 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-05-29 5:17 UTC (permalink / raw
To: gentoo-commits
robbat2 08/05/29 05:17:16
Modified: mysql.eclass
Log:
Ensure correct install of docs and config examples for bug #212910.
Revision Changes Path
1.92 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.91&r2=1.92
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -p -w -b -B -u -u -r1.91 -r1.92
--- mysql.eclass 29 May 2008 03:15:12 -0000 1.91
+++ mysql.eclass 29 May 2008 05:17:16 -0000 1.92
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.91 2008/05/29 03:15:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.92 2008/05/29 05:17:16 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -713,21 +713,21 @@ mysql_src_install() {
# Docs
dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
- doinfo ${S}/Docs/mysql.info
+ doinfo "${S}"/Docs/mysql.info
# Minimal builds don't have the MySQL server
if ! use minimal ; then
docinto "support-files"
for script in \
- support-files/my-*.cnf \
- support-files/magic \
- support-files/ndb-config-2-node.ini
+ "${S}"/support-files/my-*.cnf \
+ "${S}"/support-files/magic \
+ "${S}"/support-files/ndb-config-2-node.ini
do
dodoc "${script}"
done
docinto "scripts"
- for script in scripts/mysql* ; do
+ for script in "${S}"/scripts/mysql* ; do
[[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
done
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-05-29 5:28 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-05-29 5:28 UTC (permalink / raw
To: gentoo-commits
robbat2 08/05/29 05:28:55
Modified: mysql.eclass
Log:
MySQL hates you if your machine is called localhost per bug #213475.
Revision Changes Path
1.93 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.92&r2=1.93
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -p -w -b -B -u -u -r1.92 -r1.93
--- mysql.eclass 29 May 2008 05:17:16 -0000 1.92
+++ mysql.eclass 29 May 2008 05:28:54 -0000 1.93
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.92 2008/05/29 05:17:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.93 2008/05/29 05:28:54 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -475,6 +475,10 @@ mysql_pkg_setup() {
fi
fi
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
# Check for USE flag problems in pkg_setup
if use static && use ssl ; then
eerror "MySQL does not support being built statically with SSL support enabled!"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-05-29 5:33 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-05-29 5:33 UTC (permalink / raw
To: gentoo-commits
robbat2 08/05/29 05:33:49
Modified: mysql.eclass
Log:
Fix whitespace.
Revision Changes Path
1.94 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.93&r2=1.94
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.93
retrieving revision 1.94
diff -p -w -b -B -u -u -r1.93 -r1.94
--- mysql.eclass 29 May 2008 05:28:54 -0000 1.93
+++ mysql.eclass 29 May 2008 05:33:49 -0000 1.94
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.93 2008/05/29 05:28:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.94 2008/05/29 05:33:49 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-05-29 5:38 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-05-29 5:38 UTC (permalink / raw
To: gentoo-commits
robbat2 08/05/29 05:38:48
Modified: mysql.eclass
Log:
Improve the datadir warning message per bug #207636.
Revision Changes Path
1.95 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.94&r2=1.95
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -p -w -b -B -u -u -r1.94 -r1.95
--- mysql.eclass 29 May 2008 05:33:49 -0000 1.94
+++ mysql.eclass 29 May 2008 05:38:48 -0000 1.95
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.94 2008/05/29 05:33:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.95 2008/05/29 05:38:48 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -242,8 +242,9 @@ mysql_init_vars() {
if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
if [[ -e "${MY_DATADIR}" ]] ; then
- elog "Previous datadir found, it's YOUR job to change"
- elog "ownership and take care of it"
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
PREVIOUS_DATADIR="yes"
else
PREVIOUS_DATADIR="no"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-05-29 19:35 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-05-29 19:35 UTC (permalink / raw
To: gentoo-commits
robbat2 08/05/29 19:35:51
Modified: mysql.eclass
Log:
Make FEATURES=-userpriv test non-fatal during pkg_setup, as portage always runs pkg_setup as root, so we cannot detect FEATURES=-userpriv by using UID.
Revision Changes Path
1.96 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.95&r2=1.96
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -p -w -b -B -u -u -r1.95 -r1.96
--- mysql.eclass 29 May 2008 05:38:48 -0000 1.95
+++ mysql.eclass 29 May 2008 19:35:51 -0000 1.96
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.95 2008/05/29 05:38:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.96 2008/05/29 19:35:51 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -471,7 +471,7 @@ mysql_pkg_setup() {
if hasq test ${FEATURES} ; then
if ! use minimal ; then
if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
fi
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-10-16 18:48 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 79+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-10-16 18:48 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/10/16 18:48:42
Modified: mysql.eclass
Log:
Fix to work with libtool-2.2. Thanks to loki_val in bug #230271.
Revision Changes Path
1.97 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.96&r2=1.97
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mysql.eclass 29 May 2008 19:35:51 -0000 1.96
+++ mysql.eclass 16 Oct 2008 18:48:42 -0000 1.97
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.96 2008/05/29 19:35:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.97 2008/10/16 18:48:42 betelgeuse Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -589,6 +589,13 @@
[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
|| die "Could not copy libtool.m4 to bdb/dist/"
+ #These files exist only with libtool-2*, and need to be included.
+ if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
+ cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
+ cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
+ cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
+ cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
+ fi
pushd "bdb/dist" &>/dev/null
sh s_all \
|| die "Failed bdb reconfigure"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-11-14 1:46 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-11-14 1:46 UTC (permalink / raw
To: gentoo-commits
robbat2 08/11/14 01:46:24
Modified: mysql.eclass
Log:
Bug #224067 - disable berkdb now for all mysql builds >=5.0.60.
Revision Changes Path
1.98 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.97&r2=1.98
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -p -w -b -B -u -u -r1.97 -r1.98
--- mysql.eclass 16 Oct 2008 18:48:42 -0000 1.97
+++ mysql.eclass 14 Nov 2008 01:46:24 -0000 1.98
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.97 2008/10/16 18:48:42 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.98 2008/11/14 01:46:24 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -353,7 +353,14 @@ configure_40_41_50() {
myconf="${myconf} $(use_with ssl openssl)"
fi
+ if mysql_version_is_at_least "5.0.60" ; then
if use berkdb ; then
+ elog "Berkeley DB support was disabled due to build failures"
+ elog "on multiple arches, go to a version earlier than 5.0.60"
+ elog "if you want it again. Gentoo bug #224067."
+ fi
+ myconf="${myconf} --without-berkeley-db"
+ elif use berkdb ; then
# The following fix is due to a bug with bdb on SPARC's. See:
# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
# It comes down to non-64-bit safety problems.
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-11-14 4:48 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-11-14 4:48 UTC (permalink / raw
To: gentoo-commits
robbat2 08/11/14 04:48:29
Modified: mysql.eclass
Log:
Bug #187642 - community-specific features.
Revision Changes Path
1.99 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.98&r2=1.99
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -p -w -b -B -u -u -r1.98 -r1.99
--- mysql.eclass 14 Nov 2008 01:46:24 -0000 1.98
+++ mysql.eclass 14 Nov 2008 04:48:28 -0000 1.99
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.98 2008/11/14 01:46:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.99 2008/11/14 04:48:28 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -399,6 +399,10 @@ configure_40_41_50() {
fi
fi
+ if [ "${PN}" == "mysql-community" ]; then
+ myconf="${myconf} --enable-community-features"
+ fi
+
mysql_version_is_at_least "5.0.18" \
&& use max-idx-128 \
&& myconf="${myconf} --with-max-indexes=128"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-11-14 22:07 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-11-14 22:07 UTC (permalink / raw
To: gentoo-commits
robbat2 08/11/14 22:07:03
Modified: mysql.eclass
Log:
Bug #222279 - add undocumented support for selection of default charset and collation values. It works, but consider yourself unsupported if you use it.
Revision Changes Path
1.100 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.99&r2=1.100
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -p -w -b -B -u -u -r1.99 -r1.100
--- mysql.eclass 14 Nov 2008 04:48:28 -0000 1.99
+++ mysql.eclass 14 Nov 2008 22:07:03 -0000 1.100
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.99 2008/11/14 04:48:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.100 2008/11/14 22:07:03 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -315,7 +315,13 @@ configure_common() {
&& myconf="${myconf} --without-ndb-debug"
fi
- if mysql_version_is_at_least "4.1" && ! use latin1 ; then
+ if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+ myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
+ myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
+ elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
myconf="${myconf} --with-charset=utf8"
myconf="${myconf} --with-collation=utf8_general_ci"
else
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-11-20 20:44 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-11-20 20:44 UTC (permalink / raw
To: gentoo-commits
robbat2 08/11/20 20:44:33
Modified: mysql.eclass
Log:
Disable some parts of SSP per bug #246652 with GCC3 as they cause NDB failures.
Revision Changes Path
1.101 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.100&r2=1.101
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -p -w -b -B -u -u -r1.100 -r1.101
--- mysql.eclass 14 Nov 2008 22:07:03 -0000 1.100
+++ mysql.eclass 20 Nov 2008 20:44:33 -0000 1.101
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.100 2008/11/14 22:07:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.101 2008/11/20 20:44:33 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -644,6 +644,12 @@ mysql_src_compile() {
# glib-2.3.2_pre fix, bug #16496
append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+ # As discovered by bug #246652, doing a double-level of SSP causes NDB to
+ # fail badly during cluster startup.
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ filter-flags "-fstack-protector-all"
+ fi
+
CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
mysql_version_is_at_least "5.0" \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2008-11-29 2:30 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-11-29 2:30 UTC (permalink / raw
To: gentoo-commits
robbat2 08/11/29 02:30:44
Modified: mysql.eclass
Log:
Move the hostname==localhost check from pkg_setup to pkg_config and src_test instead, to enable building in binpkg hosts more easily.
Revision Changes Path
1.102 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.101&r2=1.102
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.101
retrieving revision 1.102
diff -p -w -b -B -u -u -r1.101 -r1.102
--- mysql.eclass 20 Nov 2008 20:44:33 -0000 1.101
+++ mysql.eclass 29 Nov 2008 02:30:43 -0000 1.102
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.101 2008/11/20 20:44:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.102 2008/11/29 02:30:43 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -493,10 +493,6 @@ mysql_pkg_setup() {
fi
fi
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
# Check for USE flag problems in pkg_setup
if use static && use ssl ; then
eerror "MySQL does not support being built statically with SSL support enabled!"
@@ -852,6 +848,10 @@ mysql_pkg_config() {
die "MySQL database already exists!"
fi
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
einfo "Creating the mysql database and setting proper"
einfo "permissions on it ..."
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-01-12 23:08 Markus Meier (maekke)
0 siblings, 0 replies; 79+ messages in thread
From: Markus Meier (maekke) @ 2009-01-12 23:08 UTC (permalink / raw
To: gentoo-commits
maekke 09/01/12 23:08:17
Modified: mysql.eclass
Log:
whitespace
Revision Changes Path
1.103 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.102&r2=1.103
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mysql.eclass 29 Nov 2008 02:30:43 -0000 1.102
+++ mysql.eclass 12 Jan 2009 23:08:17 -0000 1.103
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.102 2008/11/29 02:30:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.103 2009/01/12 23:08:17 maekke Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -358,7 +358,7 @@
else
myconf="${myconf} $(use_with ssl openssl)"
fi
-
+
if mysql_version_is_at_least "5.0.60" ; then
if use berkdb ; then
elog "Berkeley DB support was disabled due to build failures"
@@ -513,7 +513,7 @@
eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
fi
-
+
# This should come after all of the die statements
enewgroup mysql 60 || die "problem adding 'mysql' group"
enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-02-11 11:27 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-02-11 11:27 UTC (permalink / raw
To: gentoo-commits
robbat2 09/02/11 11:27:13
Modified: mysql.eclass
Log:
Fix PDEPEND for build order.
Revision Changes Path
1.104 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.103&r2=1.104
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -p -w -b -B -u -u -r1.103 -r1.104
--- mysql.eclass 12 Jan 2009 23:08:17 -0000 1.103
+++ mysql.eclass 11 Feb 2009 11:27:13 -0000 1.104
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.103 2009/01/12 23:08:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.104 2009/02/11 11:27:13 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -10,7 +10,7 @@
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
-inherit eutils flag-o-matic gnuconfig autotools mysql_fx
+inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
@@ -83,6 +83,9 @@ mysql_version_is_at_least "5.1.12" \
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+# For other stuff to bring us in
+PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
+
# Work out the default SERVER_URI correctly
if [ -z "${SERVER_URI}" ]; then
# The community build is on the mirrors
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-02-11 11:28 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-02-11 11:28 UTC (permalink / raw
To: gentoo-commits
robbat2 09/02/11 11:28:16
Modified: mysql.eclass
Log:
Add useful output to track progress of install.
Revision Changes Path
1.105 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.104&r2=1.105
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -p -w -b -B -u -u -r1.104 -r1.105
--- mysql.eclass 11 Feb 2009 11:27:13 -0000 1.104
+++ mysql.eclass 11 Feb 2009 11:28:16 -0000 1.105
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.104 2009/02/11 11:27:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.105 2009/02/11 11:28:16 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -691,11 +691,13 @@ mysql_src_install() {
doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
# Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
# Various junk (my-*.cnf moved elsewhere)
+ einfo "Removing duplicate /usr/share/mysql files"
rm -Rf "${D}/usr/share/info"
for removeme in "mysql-log-rotate" mysql.server* \
binary-configure* my-*.cnf mi_test_all*
@@ -705,6 +707,7 @@ mysql_src_install() {
# Clean up stuff for a minimal build
if use minimal ; then
+ einfo "Remove all extra content for minimal build"
rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
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}
rm -f "${D}/usr/sbin/mysqld"
@@ -717,6 +720,7 @@ mysql_src_install() {
else
mysql_mycnf_version="4.0"
fi
+ einfo "Building default my.cnf"
insinto "${MY_SYSCONFDIR}"
doins scripts/mysqlaccess.conf
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
@@ -729,6 +733,7 @@ mysql_src_install() {
# Minimal builds don't have the MySQL server
if ! use minimal ; then
+ einfo "Creating initial directories"
# Empty directories ...
diropts "-m0750"
if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
@@ -746,11 +751,13 @@ mysql_src_install() {
fi
# Docs
+ einfo "Installing docs"
dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
doinfo "${S}"/Docs/mysql.info
# Minimal builds don't have the MySQL server
if ! use minimal ; then
+ einfo "Including support files and sample configurations"
docinto "support-files"
for script in \
"${S}"/support-files/my-*.cnf \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-02-11 11:29 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-02-11 11:29 UTC (permalink / raw
To: gentoo-commits
robbat2 09/02/11 11:29:48
Modified: mysql.eclass
Log:
Bug #252732: A really really old problem from v1.1 of the eclass caused the original my_config.h to be preserved always instead of being overwritten. If you had an old header with the atomic.h problem, this means it never went away.
Revision Changes Path
1.106 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.105&r2=1.106
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.105
retrieving revision 1.106
diff -p -w -b -B -u -u -r1.105 -r1.106
--- mysql.eclass 11 Feb 2009 11:28:16 -0000 1.105
+++ mysql.eclass 11 Feb 2009 11:29:48 -0000 1.106
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.105 2009/02/11 11:28:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.106 2009/02/11 11:29:48 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -687,9 +687,6 @@ mysql_src_install() {
mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
- insinto "${MY_INCLUDEDIR}"
- doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
-
# Convenience links
einfo "Making Convenience links for mysqlcheck multi-call binary"
dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-02-28 10:49 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-02-28 10:49 UTC (permalink / raw
To: gentoo-commits
robbat2 09/02/28 10:49:50
Modified: mysql.eclass
Log:
Back in 2006 we updated 4.1 and 5.0 per upstreams request that InnoDB was always build. However 5.1 never got updated, so do it now.
Revision Changes Path
1.107 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.106&r2=1.107
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.106
retrieving revision 1.107
diff -p -w -b -B -u -u -r1.106 -r1.107
--- mysql.eclass 11 Feb 2009 11:29:48 -0000 1.106
+++ mysql.eclass 28 Feb 2009 10:49:50 -0000 1.107
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.106 2009/02/11 11:29:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.107 2009/02/28 10:49:50 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -74,7 +74,7 @@ mysql_version_is_at_least "5.1" \
# compile-time-only
mysql_version_is_at_least "5.1.12" \
-&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"
+&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
# BitKeeper dependency, compile-time only
[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
@@ -126,9 +126,6 @@ mysql_version_is_at_least "5.0.18" \
&& IUSE="${IUSE} max-idx-128"
mysql_version_is_at_least "5.1" \
-&& IUSE="${IUSE} innodb"
-
-mysql_version_is_at_least "5.1" \
|| IUSE="${IUSE} berkdb"
mysql_version_is_at_least "5.1.12" \
@@ -441,9 +438,8 @@ configure_51() {
elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
fi
- if use innodb ; then
+ # Upstream specifically requests that InnoDB always be built.
plugins="${plugins},innobase"
- fi
# like configuration=max-no-ndb
if use cluster ; then
@@ -584,8 +580,7 @@ mysql_src_unpack() {
if mysql_version_is_at_least "5.1.12" ; then
rebuilddirlist="."
# TODO: check this with a cmake expert
- use innodb \
- && cmake \
+ cmake \
-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
"storage/innobase"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-02-28 10:50 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-02-28 10:50 UTC (permalink / raw
To: gentoo-commits
robbat2 09/02/28 10:50:24
Modified: mysql.eclass
Log:
Newer patchset.
Revision Changes Path
1.108 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.107&r2=1.108
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.107
retrieving revision 1.108
diff -p -w -b -B -u -u -r1.107 -r1.108
--- mysql.eclass 28 Feb 2009 10:49:50 -0000 1.107
+++ mysql.eclass 28 Feb 2009 10:50:24 -0000 1.108
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.107 2009/02/28 10:49:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.108 2009/02/28 10:50:24 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -16,7 +16,7 @@ inherit eutils flag-o-matic gnuconfig au
# and we will run a mysql server during test phase
S="${WORKDIR}/mysql"
-[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108"
+[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
EGIT_PROJECT=mysql-extras
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-02-28 10:51 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-02-28 10:51 UTC (permalink / raw
To: gentoo-commits
robbat2 09/02/28 10:51:57
Modified: mysql.eclass
Log:
BitKeeper is long dead.
Revision Changes Path
1.109 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.108&r2=1.109
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.108
retrieving revision 1.109
diff -p -w -b -B -u -u -r1.108 -r1.109
--- mysql.eclass 28 Feb 2009 10:50:24 -0000 1.108
+++ mysql.eclass 28 Feb 2009 10:51:57 -0000 1.109
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.108 2009/02/28 10:50:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.109 2009/02/28 10:51:57 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -23,14 +23,6 @@ if [[ "${MY_EXTRAS_VER}" == "live" ]]; t
inherit git
fi
-if [[ ${PR#r} -lt 60 ]] ; then
- IS_BITKEEPER=0
-elif [[ ${PR#r} -lt 90 ]] ; then
- IS_BITKEEPER=60
-else
- IS_BITKEEPER=90
-fi
-
# MYSQL_VERSION_ID will be:
# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
# This is an important part, because many of the choices the MySQL ebuild will do
@@ -76,10 +68,6 @@ mysql_version_is_at_least "5.1" \
mysql_version_is_at_least "5.1.12" \
&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
-# BitKeeper dependency, compile-time only
-[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
-
-
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
@@ -138,69 +126,6 @@ EXPORT_FUNCTIONS pkg_setup src_unpack sr
# HELPER FUNCTIONS:
#
-bitkeeper_fetch() {
- local reposuf
- if [[ -z "${1}" ]] ; then
- local tpv
- tpv=( ${PV//[-._]/ } )
- reposuf="mysql-${tpv[0]}.${tpv[1]}"
- else
- reposuf="${1}"
- fi
- einfo "Using '${reposuf}' repository."
- local repo_uri="bk://mysql.bkbits.net/${reposuf}"
- ## -- ebk_store_dir: bitkeeper sources store directory
- local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
- ## -- ebk_fetch_cmd: bitkeeper fetch command
- # always fetch the latest revision, use -r<revision> if a specified revision is wanted
- # hint: does not work
- local ebk_fetch_cmd="sfioball"
- ## -- ebk_update_cmd: bitkeeper update command
- local ebk_update_cmd="update"
-
- # addread "/etc/bitkeeper"
- addwrite "${ebk_store_dir}"
-
- if [[ ! -d "${ebk_store_dir}" ]] ; then
- debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
- mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}"
- fi
-
- pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}"
-
- local wc_path=${reposuf}
-
- if [[ ! -d "${wc_path}" ]] ; then
- local options="-r+"
-
- # first checkout
- einfo "bitkeeper checkout start -->"
- einfo " repository: ${repo_uri}"
-
- ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
- || die "BK: couldn't fetch from ${repo_uri}"
- else
- if [[ ! -d "${wc_path}/BK" ]] ; then
- popd
- die "Looks like ${wc_path} is not a bitkeeper path"
- fi
-
- # update working copy
- einfo "bitkeeper update start -->"
- einfo " repository: ${repo_uri}"
-
- ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
- || die "BK: couldn't update from ${repo_uri} to ${wc_path}"
- fi
-
- einfo " working copy: ${wc_path}"
- cd "${wc_path}"
- rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}"
-
- echo
- popd
-}
-
mysql_disable_test() {
local testname="${1}" ; shift
local reason="${@}"
@@ -529,22 +454,9 @@ mysql_src_unpack() {
unpack ${A}
# Grab the patches
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
- # Bitkeeper checkout support
- if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
- if mysql_check_version_range "5.1 to 5.1.99" ; then
- bitkeeper_fetch "mysql-5.1-ndb"
- elif mysql_check_version_range "5.2 to 5.2.99" ; then
- bitkeeper_fetch "mysql-5.2-falcon"
- else
- bitkeeper_fetch
- fi
- cd "${S}"
- einfo "Running upstream autorun over BK sources ..."
- BUILD/autorun.sh
- else
+
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
cd "${S}"
- fi
# Apply the patches for this MySQL version
EPATCH_SUFFIX="patch"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-07-06 18:18 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-07-06 18:18 UTC (permalink / raw
To: gentoo-commits
robbat2 09/07/06 18:18:00
Modified: mysql.eclass
Log:
Update for community features being merged back into the main mysql tree as of version 5.0.82.
Revision Changes Path
1.110 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.109&r2=1.110
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -p -w -b -B -u -u -r1.109 -r1.110
--- mysql.eclass 28 Feb 2009 10:51:57 -0000 1.109
+++ mysql.eclass 6 Jul 2009 18:18:00 -0000 1.110
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.109 2009/02/28 10:51:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.110 2009/07/06 18:18:00 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -41,6 +41,16 @@ done
# strip leading "0" (otherwise it's considered an octal number by BASH)
MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+# Community features are available in mysql-community
+# AND in the re-merged mysql-5.0.82 and newer
+if [ "${PN}" == "mysql-community" ]; then
+ MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
+ MYSQL_COMMUNITY_FEATURES=1
+else
+ MYSQL_COMMUNITY_FEATURES=0
+fi
+
# Be warned, *DEPEND are version-dependant
# These are used for both runtime and compiletime
DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
@@ -77,9 +87,9 @@ PDEPEND="${PDEPEND} =virtual/mysql-$(get
# Work out the default SERVER_URI correctly
if [ -z "${SERVER_URI}" ]; then
# The community build is on the mirrors
- if [ "${PN}" == "mysql-community" ]; then
+ if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
- # The enterprise source is on the primary site only
+ # The (old) enterprise source is on the primary site only
elif [ "${PN}" == "mysql" ]; then
SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
fi
@@ -119,6 +129,9 @@ mysql_version_is_at_least "5.1" \
mysql_version_is_at_least "5.1.12" \
&& IUSE="${IUSE} pbxt"
+[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
+&& IUSE="${IUSE} community profiling"
+
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
pkg_postinst pkg_config pkg_postrm
@@ -330,8 +343,13 @@ configure_40_41_50() {
fi
fi
- if [ "${PN}" == "mysql-community" ]; then
- myconf="${myconf} --enable-community-features"
+ if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
+ myconf="${myconf} `use_enable community community-features`"
+ if use community; then
+ myconf="${myconf} `use_enable profiling`"
+ else
+ myconf="${myconf} --disable-profiling"
+ fi
fi
mysql_version_is_at_least "5.0.18" \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-07-06 18:21 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-07-06 18:21 UTC (permalink / raw
To: gentoo-commits
robbat2 09/07/06 18:21:18
Modified: mysql.eclass
Log:
Bug #212407: Allow for datadir that is changed by user to work better during pkg_config.
Revision Changes Path
1.111 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.110&r2=1.111
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -p -w -b -B -u -u -r1.110 -r1.111
--- mysql.eclass 6 Jul 2009 18:18:00 -0000 1.110
+++ mysql.eclass 6 Jul 2009 18:21:18 -0000 1.111
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.110 2009/07/06 18:18:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.111 2009/07/06 18:21:18 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -189,6 +189,20 @@ mysql_init_vars() {
fi
export PREVIOUS_DATADIR
fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
fi
MY_SOURCEDIR=${SERVER_URI##*/}
@@ -760,6 +774,8 @@ mysql_pkg_postinst() {
}
mysql_pkg_config() {
+ local old_MY_DATADIR="${MY_DATADIR}"
+
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -769,6 +785,30 @@ mysql_pkg_config() {
die "Minimal builds do NOT include the MySQL server"
fi
+ if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+ local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
+ local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
+
+ if [[ -d "${old_MY_DATADIR_s}" ]]; then
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+ ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+ else
+ elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+ mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+ || die "Moving MY_DATADIR failed"
+ fi
+ else
+ ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Attempting to use ${MY_DATADIR_s}"
+ else
+ eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+ die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+ fi
+ fi
+ fi
+
local pwd1="a"
local pwd2="b"
local maxtry=5
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-07-06 18:58 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-07-06 18:58 UTC (permalink / raw
To: gentoo-commits
robbat2 09/07/06 18:58:41
Modified: mysql.eclass
Log:
Take mysql.eclass into the realm of EAPI2.
Revision Changes Path
1.112 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.111&r2=1.112
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.111
retrieving revision 1.112
diff -p -w -b -B -u -u -r1.111 -r1.112
--- mysql.eclass 6 Jul 2009 18:21:18 -0000 1.111
+++ mysql.eclass 6 Jul 2009 18:58:41 -0000 1.112
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.111 2009/07/06 18:21:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.112 2009/07/06 18:58:41 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -132,8 +132,24 @@ mysql_version_is_at_least "5.1.12" \
[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
&& IUSE="${IUSE} community profiling"
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
- pkg_postinst pkg_config pkg_postrm
+case "${EAPI:-0}" in
+ 2)
+ EXPORT_FUNCTIONS pkg_setup \
+ src_unpack src_prepare \
+ src_configure src_compile \
+ src_install \
+ pkg_preinst pkg_postinst \
+ pkg_config pkg_postrm
+ ;;
+ *)
+ EXPORT_FUNCTIONS pkg_setup \
+ src_unpack \
+ src_compile \
+ src_install \
+ pkg_preinst pkg_postinst \
+ pkg_config pkg_postrm
+ ;;
+esac
#
# HELPER FUNCTIONS:
@@ -411,7 +427,7 @@ configure_51() {
myconf="${myconf} --with-plugins=${plugins}"
}
-pbxt_src_compile() {
+pbxt_src_configure() {
mysql_init_vars
pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
@@ -424,6 +440,13 @@ pbxt_src_compile() {
use debug && myconf="${myconf} --with-debug=full"
# TODO: is it safe/needed to use econf here ?
./configure ${myconf} || die "Problem configuring PBXT storage engine"
+}
+
+pbxt_src_compile() {
+ # Be backwards compatible for now
+ if [[ $EAPI != 2 ]]; then
+ pbxt_src_configure
+ fi
# TODO: is it safe/needed to use emake here ?
make || die "Problem making PBXT storage engine (${myconf})"
@@ -488,6 +511,14 @@ mysql_src_unpack() {
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
+
+ # Be backwards compatible for now
+ if [[ $EAPI != 2 ]]; then
+ mysql_src_prepare
+ fi
+}
+
+mysql_src_prepare() {
cd "${S}"
# Apply the patches for this MySQL version
@@ -558,7 +589,7 @@ mysql_src_unpack() {
fi
}
-mysql_src_compile() {
+mysql_src_configure() {
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -613,6 +644,17 @@ mysql_src_compile() {
| xargs -0 -n100 sed -i \
-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
+ if [[ $EAPI == 2 ]]; then
+ mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure
+ fi
+}
+
+mysql_src_compile() {
+ # Be backwards compatible for now
+ if [[ $EAPI != 2 ]]; then
+ mysql_src_configure
+ fi
+
emake || die "emake failed"
mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-07-06 19:05 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-07-06 19:05 UTC (permalink / raw
To: gentoo-commits
robbat2 09/07/06 19:05:08
Modified: mysql.eclass
Log:
IUSE defaults for mysql.eclass.
Revision Changes Path
1.113 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.112&r2=1.113
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.112
retrieving revision 1.113
diff -p -w -b -B -u -u -r1.112 -r1.113
--- mysql.eclass 6 Jul 2009 18:58:41 -0000 1.112
+++ mysql.eclass 6 Jul 2009 19:05:07 -0000 1.113
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.112 2009/07/06 18:58:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.113 2009/07/06 19:05:07 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -10,6 +10,26 @@
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
+case "${EAPI:-0}" in
+ 2)
+ EXPORT_FUNCTIONS pkg_setup \
+ src_unpack src_prepare \
+ src_configure src_compile \
+ src_install \
+ pkg_preinst pkg_postinst \
+ pkg_config pkg_postrm
+ IUSE_DEFAULT_ON='+'
+ ;;
+ *)
+ EXPORT_FUNCTIONS pkg_setup \
+ src_unpack \
+ src_compile \
+ src_install \
+ pkg_preinst pkg_postinst \
+ pkg_config pkg_postrm
+ ;;
+esac
+
inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
# Shorten the path because the socket path length must be shorter than 107 chars
@@ -109,7 +129,7 @@ DESCRIPTION="A fast, multi-threaded, mul
HOMEPAGE="http://www.mysql.com/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="big-tables debug embedded minimal perl selinux ssl static"
+IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static"
mysql_version_is_at_least "4.1" \
&& IUSE="${IUSE} latin1"
@@ -130,26 +150,7 @@ mysql_version_is_at_least "5.1.12" \
&& IUSE="${IUSE} pbxt"
[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
-&& IUSE="${IUSE} community profiling"
-
-case "${EAPI:-0}" in
- 2)
- EXPORT_FUNCTIONS pkg_setup \
- src_unpack src_prepare \
- src_configure src_compile \
- src_install \
- pkg_preinst pkg_postinst \
- pkg_config pkg_postrm
- ;;
- *)
- EXPORT_FUNCTIONS pkg_setup \
- src_unpack \
- src_compile \
- src_install \
- pkg_preinst pkg_postinst \
- pkg_config pkg_postrm
- ;;
-esac
+&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
#
# HELPER FUNCTIONS:
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-07-06 19:06 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-07-06 19:06 UTC (permalink / raw
To: gentoo-commits
robbat2 09/07/06 19:06:03
Modified: mysql.eclass
Log:
EXPORT_FUNCTIONS goes after inherit.
Revision Changes Path
1.114 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.113&r2=1.114
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.113
retrieving revision 1.114
diff -p -w -b -B -u -u -r1.113 -r1.114
--- mysql.eclass 6 Jul 2009 19:05:07 -0000 1.113
+++ mysql.eclass 6 Jul 2009 19:06:03 -0000 1.114
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.113 2009/07/06 19:05:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.114 2009/07/06 19:06:03 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -10,6 +10,8 @@
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
+inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
+
case "${EAPI:-0}" in
2)
EXPORT_FUNCTIONS pkg_setup \
@@ -30,8 +32,6 @@ case "${EAPI:-0}" in
;;
esac
-inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
-
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
S="${WORKDIR}/mysql"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-09-08 5:28 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-09-08 5:28 UTC (permalink / raw
To: gentoo-commits
robbat2 09/09/08 05:28:04
Modified: mysql.eclass
Log:
Bug #283926: GCC4.4 causes libmysqlclient users to potentially have bad behavior.
Revision Changes Path
1.115 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.114&r2=1.115
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.114
retrieving revision 1.115
diff -p -w -b -B -u -u -r1.114 -r1.115
--- mysql.eclass 6 Jul 2009 19:06:03 -0000 1.114
+++ mysql.eclass 8 Sep 2009 05:28:03 -0000 1.115
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.114 2009/07/06 19:06:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.115 2009/09/08 05:28:03 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -626,6 +626,9 @@ mysql_src_configure() {
&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
export CXXFLAGS
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
econf \
--libexecdir="/usr/sbin" \
--sysconfdir="${MY_SYSCONFDIR}" \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-10-11 11:42 Markus Meier (maekke)
0 siblings, 0 replies; 79+ messages in thread
From: Markus Meier (maekke) @ 2009-10-11 11:42 UTC (permalink / raw
To: gentoo-commits
maekke 09/10/11 11:42:07
Modified: mysql.eclass
Log:
whitespace
Revision Changes Path
1.116 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.115&r2=1.116
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mysql.eclass 8 Sep 2009 05:28:03 -0000 1.115
+++ mysql.eclass 11 Oct 2009 11:42:07 -0000 1.116
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.115 2009/09/08 05:28:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.116 2009/10/11 11:42:07 maekke Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -510,7 +510,7 @@
unpack ${A}
# Grab the patches
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
-
+
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
# Be backwards compatible for now
@@ -851,7 +851,7 @@
else
eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
+ fi
fi
fi
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-11-19 18:22 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-11-19 18:22 UTC (permalink / raw
To: gentoo-commits
robbat2 09/11/19 18:22:44
Modified: mysql.eclass
Log:
For newer 5.1 series MySQL, community features are also available. Only turn on as of 5.1.28, as the config option was not available earlier (and caused a configure fail).
Revision Changes Path
1.117 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.116&r2=1.117
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.116
retrieving revision 1.117
diff -p -w -b -B -u -u -r1.116 -r1.117
--- mysql.eclass 11 Oct 2009 11:42:07 -0000 1.116
+++ mysql.eclass 19 Nov 2009 18:22:44 -0000 1.117
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.116 2009/10/11 11:42:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.117 2009/11/19 18:22:44 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -67,6 +67,8 @@ if [ "${PN}" == "mysql-community" ]; the
MYSQL_COMMUNITY_FEATURES=1
elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
+ MYSQL_COMMUNITY_FEATURES=1
else
MYSQL_COMMUNITY_FEATURES=0
fi
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-11-19 20:59 Hanno Boeck (hanno)
0 siblings, 0 replies; 79+ messages in thread
From: Hanno Boeck (hanno) @ 2009-11-19 20:59 UTC (permalink / raw
To: gentoo-commits
hanno 09/11/19 20:59:38
Modified: mysql.eclass
Log:
adjust mysql eclass for mysql 5.4
Revision Changes Path
1.118 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.117&r2=1.118
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- mysql.eclass 19 Nov 2009 18:22:44 -0000 1.117
+++ mysql.eclass 19 Nov 2009 20:59:38 -0000 1.118
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.117 2009/11/19 18:22:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.118 2009/11/19 20:59:38 hanno Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -69,6 +69,8 @@
MYSQL_COMMUNITY_FEATURES=1
elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#5.4}" != "${PV}" ]; then
+ MYSQL_COMMUNITY_FEATURES=1
else
MYSQL_COMMUNITY_FEATURES=0
fi
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-12-09 18:45 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-12-09 18:45 UTC (permalink / raw
To: gentoo-commits
robbat2 09/12/09 18:45:46
Modified: mysql.eclass
Log:
Add eclass documentation and clean up EAPI version checks, thanks to jmbsvicetto for the work.
Revision Changes Path
1.119 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.119&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.119&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.118&r2=1.119
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.118
retrieving revision 1.119
diff -p -w -b -B -u -u -r1.118 -r1.119
--- mysql.eclass 19 Nov 2009 20:59:38 -0000 1.118
+++ mysql.eclass 9 Dec 2009 18:45:46 -0000 1.119
@@ -1,11 +1,19 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.118 2009/11/19 20:59:38 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.119 2009/12/09 18:45:46 robbat2 Exp $
+# @ECLASS: mysql.eclass
+# @MAINTAINER:
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
-# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
+# Maintainers: MySQL Team <mysql-bugs@gentoo.org>
# - Luca Longinotti <chtekk@gentoo.org>
# - Robin H. Johnson <robbat2@gentoo.org>
+# @BLURB: This eclass provides most of the functions for mysql ebuilds
+# @DESCRIPTION:
+# The mysql.eclass provides almost all the code to build the mysql ebuilds
+# including the src_unpack, src_prepare, src_configure, src_compile,
+# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
+# phase hooks.
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
@@ -22,7 +30,7 @@ case "${EAPI:-0}" in
pkg_config pkg_postrm
IUSE_DEFAULT_ON='+'
;;
- *)
+ 0 | 1)
EXPORT_FUNCTIONS pkg_setup \
src_unpack \
src_compile \
@@ -30,6 +38,8 @@ case "${EAPI:-0}" in
pkg_preinst pkg_postinst \
pkg_config pkg_postrm
;;
+ *)
+ die "Unsupported EAPI: ${EAPI}" ;;
esac
# Shorten the path because the socket path length must be shorter than 107 chars
@@ -43,6 +53,8 @@ if [[ "${MY_EXTRAS_VER}" == "live" ]]; t
inherit git
fi
+# @ECLASS-VARIABLE: MYSQL_VERSION_ID
+# @DESCRIPTION:
# MYSQL_VERSION_ID will be:
# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
# This is an important part, because many of the choices the MySQL ebuild will do
@@ -61,6 +73,10 @@ done
# strip leading "0" (otherwise it's considered an octal number by BASH)
MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
+# @DESCRIPTION:
+# Specifiy if community features are available. Possible values are 1 (yes)
+# and 0 (no).
# Community features are available in mysql-community
# AND in the re-merged mysql-5.0.82 and newer
if [ "${PN}" == "mysql-community" ]; then
@@ -160,6 +177,9 @@ mysql_version_is_at_least "5.1.12" \
# HELPER FUNCTIONS:
#
+# @FUNCTION: mysql_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
mysql_disable_test() {
local testname="${1}" ; shift
local reason="${@}"
@@ -168,11 +188,11 @@ mysql_disable_test() {
ewarn "test '${testname}' disabled: '${reason}'"
}
+# @FUNCTION: mysql_init_vars
+# @DESCRIPTION:
# void mysql_init_vars()
-#
# Initialize global variables
# 2005-11-19 <vivo@gentoo.org>
-
mysql_init_vars() {
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
@@ -468,6 +488,13 @@ pbxt_src_install() {
#
# EBUILD FUNCTIONS
#
+# @FUNCTION: mysql_pkg_setup
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_setup phase:
+# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
+# check for conflicting use flags
+# create new user and group for mysql
+# warn about deprecated features
mysql_pkg_setup() {
if hasq test ${FEATURES} ; then
if ! use minimal ; then
@@ -507,6 +534,9 @@ mysql_pkg_setup() {
&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
}
+# @FUNCTION: mysql_src_unpack
+# @DESCRIPTION:
+# Unpack the source code and call mysql_src_prepare for EAPI < 2.
mysql_src_unpack() {
# Initialize the proper variables first
mysql_init_vars
@@ -518,11 +548,15 @@ mysql_src_unpack() {
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
# Be backwards compatible for now
- if [[ $EAPI != 2 ]]; then
- mysql_src_prepare
- fi
+ case ${EAPI:-0} in
+ 2) : ;;
+ 0 | 1) mysql_src_prepare ;;
+ esac
}
+# @FUNCTION: mysql_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
mysql_src_prepare() {
cd "${S}"
@@ -594,6 +628,9 @@ mysql_src_prepare() {
fi
}
+# @FUNCTION: mysql_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
mysql_src_configure() {
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -657,17 +694,24 @@ mysql_src_configure() {
fi
}
+# @FUNCTION: mysql_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
mysql_src_compile() {
# Be backwards compatible for now
- if [[ $EAPI != 2 ]]; then
- mysql_src_configure
- fi
+ case ${EAPI:-0} in
+ 2) : ;;
+ 0 | 1) mysql_src_configure ;;
+ esac
emake || die "emake failed"
mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
}
+# @FUNCTION: mysql_src_install
+# @DESCRIPTION:
+# Install mysql.
mysql_src_install() {
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -763,11 +807,22 @@ mysql_src_install() {
mysql_lib_symlinks "${D}"
}
+# @FUNCTION: mysql_pkg_preinst
+# @DESCRIPTION:
+# Create the user and groups for mysql - die if that fails.
mysql_pkg_preinst() {
enewgroup mysql 60 || die "problem adding 'mysql' group"
enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
}
+# @FUNCTION: mysql_pkg_postinst
+# @DESCRIPTION:
+# Run post-installation tasks:
+# create the dir for logfiles if non-existant
+# touch the logfiles and secure them
+# install scripts
+# issue required steps for optional features
+# issue deprecation warnings
mysql_pkg_postinst() {
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -823,6 +878,9 @@ mysql_pkg_postinst() {
&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
}
+# @FUNCTION: mysql_pkg_config
+# @DESCRIPTION:
+# Configure mysql environment.
mysql_pkg_config() {
local old_MY_DATADIR="${MY_DATADIR}"
@@ -967,6 +1025,9 @@ mysql_pkg_config() {
einfo "Done"
}
+# @FUNCTION: mysql_pkg_postrm
+# @DESCRIPTION:
+# Remove mysql symlinks.
mysql_pkg_postrm() {
: # mysql_lib_symlinks "${D}"
}
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-12-09 18:46 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-12-09 18:46 UTC (permalink / raw
To: gentoo-commits
robbat2 09/12/09 18:46:54
Modified: mysql.eclass
Log:
Add in initial support for Percona XtraDB for the new 5.1 ebuilds. Again thanks to jmbsvicetto (reformatted slightly).
Revision Changes Path
1.120 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.119&r2=1.120
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.119
retrieving revision 1.120
diff -p -w -b -B -u -u -r1.119 -r1.120
--- mysql.eclass 9 Dec 2009 18:45:46 -0000 1.119
+++ mysql.eclass 9 Dec 2009 18:46:53 -0000 1.120
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.119 2009/12/09 18:45:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.120 2009/12/09 18:46:53 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -91,6 +91,16 @@ else
MYSQL_COMMUNITY_FEATURES=0
fi
+# @ECLASS-VARIABLE: XTRADB_VER
+# @DESCRIPTION:
+# Version of the XTRADB storage engine
+XTRADB_VER="${XTRADB_VER}"
+
+# @ECLASS-VARIABLE: PERCONA_VER
+# @DESCRIPTION:
+# Designation by PERCONA for a MySQL version to apply an XTRADB release
+PERCONA_VER="${PERCONA_VER}"
+
# Be warned, *DEPEND are version-dependant
# These are used for both runtime and compiletime
DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
@@ -141,9 +151,16 @@ SRC_URI="${SERVER_URI}"
[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+PBXT_SRC_URI="mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz"
mysql_version_is_at_least "5.1.12" \
&& [[ -n "${PBXT_VERSION}" ]] \
-&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
+&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URIPBXT_SRC_URI} )"
+
+# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
+XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/percona-xtradb-${XTRADB_VER}.tar.gz"
+mysql_version_is_at_least "5.1.26" \
+&& [[ -n ${XTRADB_VER} && -n ${PERCONA_VER} ]] \
+&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
HOMEPAGE="http://www.mysql.com/"
@@ -169,6 +186,9 @@ mysql_version_is_at_least "5.1" \
mysql_version_is_at_least "5.1.12" \
&& IUSE="${IUSE} pbxt"
+mysql_version_is_at_least "5.1.26" \
+&& IUSE="${IUSE} xtradb"
+
[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-12-09 18:54 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-12-09 18:54 UTC (permalink / raw
To: gentoo-commits
robbat2 09/12/09 18:54:05
Modified: mysql.eclass
Log:
Only offer IUSE=pbxt/xtradb IF the patches are available for the version in question.
Revision Changes Path
1.121 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.120&r2=1.121
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.120
retrieving revision 1.121
diff -p -w -b -B -u -u -r1.120 -r1.121
--- mysql.eclass 9 Dec 2009 18:46:53 -0000 1.120
+++ mysql.eclass 9 Dec 2009 18:54:05 -0000 1.121
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.120 2009/12/09 18:46:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.121 2009/12/09 18:54:05 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -159,7 +159,7 @@ mysql_version_is_at_least "5.1.12" \
# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/percona-xtradb-${XTRADB_VER}.tar.gz"
mysql_version_is_at_least "5.1.26" \
-&& [[ -n ${XTRADB_VER} && -n ${PERCONA_VER} ]] \
+&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
@@ -184,9 +184,11 @@ mysql_version_is_at_least "5.1" \
|| IUSE="${IUSE} berkdb"
mysql_version_is_at_least "5.1.12" \
+&& [[ -n "${PBXT_VERSION}" ]] \
&& IUSE="${IUSE} pbxt"
mysql_version_is_at_least "5.1.26" \
+&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
&& IUSE="${IUSE} xtradb"
[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-12-09 19:17 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-12-09 19:17 UTC (permalink / raw
To: gentoo-commits
robbat2 09/12/09 19:17:49
Modified: mysql.eclass
Log:
Unpack/compile support for xtradb.
Revision Changes Path
1.122 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.122&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.122&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.121&r2=1.122
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.121
retrieving revision 1.122
diff -p -w -b -B -u -u -r1.121 -r1.122
--- mysql.eclass 9 Dec 2009 18:54:05 -0000 1.121
+++ mysql.eclass 9 Dec 2009 19:17:49 -0000 1.122
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.121 2009/12/09 18:54:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.122 2009/12/09 19:17:49 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -148,18 +148,24 @@ fi
# Define correct SRC_URIs
SRC_URI="${SERVER_URI}"
-[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}
+# Gentoo patches to MySQL
+[[ ${MY_EXTRAS_VER} != live ]] \
+&& SRC_URI="${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-PBXT_SRC_URI="mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz"
+
+# PBXT engine
mysql_version_is_at_least "5.1.12" \
&& [[ -n "${PBXT_VERSION}" ]] \
+&& PBXT_P="pbxt-${PBXT_VERSION}" \
+&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URIPBXT_SRC_URI} )"
# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/percona-xtradb-${XTRADB_VER}.tar.gz"
mysql_version_is_at_least "5.1.26" \
&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
+&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
+&& XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
@@ -602,6 +608,7 @@ mysql_src_prepare() {
if mysql_version_is_at_least "4.1" ; then
# Remove what needs to be recreated, so we're sure it's actually done
+ einfo "Cleaning up old buildscript files"
find . -name Makefile \
-o -name Makefile.in \
-o -name configure \
@@ -612,7 +619,21 @@ mysql_src_prepare() {
local rebuilddirlist d
+ if mysql_version_is_at_least "5.1.26" && use xtradb ; then
+ einfo "Replacing InnoDB with Percona XtraDB"
+ pushd "${S}"/storage
+ i="innobase"
+ o="${WORKDIR}/storage-${i}.mysql-upstream"
+ # Have we been here already?
+ [ -h "${i}" ] && rm -f "${i}"
+ # Or maybe we haven't
+ [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
+ ln -s "${WORKDIR}/${XTRADB_P}" "${i}"
+ popd
+ fi
+
if mysql_version_is_at_least "5.1.12" ; then
+ einfo "Updating innobase cmake"
rebuilddirlist="."
# TODO: check this with a cmake expert
cmake \
@@ -632,6 +653,7 @@ mysql_src_prepare() {
if mysql_check_version_range "4.1 to 5.0.99.99" \
&& use berkdb ; then
+ einfo "Fixing up berkdb buildsystem"
[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
|| die "Could not copy libtool.m4 to bdb/dist/"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2009-12-10 1:27 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-12-10 1:27 UTC (permalink / raw
To: gentoo-commits
robbat2 09/12/10 01:27:59
Modified: mysql.eclass
Log:
Fix paste typo.
Revision Changes Path
1.123 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.123&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.123&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.122&r2=1.123
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.122
retrieving revision 1.123
diff -p -w -b -B -u -u -r1.122 -r1.123
--- mysql.eclass 9 Dec 2009 19:17:49 -0000 1.122
+++ mysql.eclass 10 Dec 2009 01:27:59 -0000 1.123
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.122 2009/12/09 19:17:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.123 2009/12/10 01:27:59 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -159,7 +159,7 @@ mysql_version_is_at_least "5.1.12" \
&& [[ -n "${PBXT_VERSION}" ]] \
&& PBXT_P="pbxt-${PBXT_VERSION}" \
&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
-&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URIPBXT_SRC_URI} )"
+&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
mysql_version_is_at_least "5.1.26" \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-01-31 3:05 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-01-31 3:05 UTC (permalink / raw
To: gentoo-commits
robbat2 10/01/31 03:05:55
Modified: mysql.eclass
Log:
Add an extra backup location for the mysql-extras tarballs.
Revision Changes Path
1.124 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.124&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.124&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.123&r2=1.124
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.123
retrieving revision 1.124
diff -p -w -b -B -u -u -r1.123 -r1.124
--- mysql.eclass 10 Dec 2009 01:27:59 -0000 1.123
+++ mysql.eclass 31 Jan 2010 03:05:54 -0000 1.124
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.123 2009/12/10 01:27:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.124 2010/01/31 03:05:54 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -152,7 +152,8 @@ SRC_URI="${SERVER_URI}"
[[ ${MY_EXTRAS_VER} != live ]] \
&& SRC_URI="${SRC_URI}
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
- http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+ http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
# PBXT engine
mysql_version_is_at_least "5.1.12" \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-01-31 5:00 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-01-31 5:00 UTC (permalink / raw
To: gentoo-commits
robbat2 10/01/31 05:00:43
Modified: mysql.eclass
Log:
Bug #290570, somewhere between 5.0.76 and 5.0.83, upstream made changes that require a fairly new GCC.
Revision Changes Path
1.125 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.124&r2=1.125
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.124
retrieving revision 1.125
diff -p -w -b -B -u -u -r1.124 -r1.125
--- mysql.eclass 31 Jan 2010 03:05:54 -0000 1.124
+++ mysql.eclass 31 Jan 2010 05:00:43 -0000 1.125
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.124 2010/01/31 03:05:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.125 2010/01/31 05:00:43 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -553,6 +553,14 @@ mysql_pkg_setup() {
die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
fi
+ # Bug #290570 fun. Upstream made us need a fairly new GCC4.
+ if mysql_version_is_at_least "5.0.83" ; then
+ GCC_VER=$(gcc_version)
+ case ${GCC_VER} in
+ 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;;
+ esac
+ fi
+
# This should come after all of the die statements
enewgroup mysql 60 || die "problem adding 'mysql' group"
enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-01-31 5:47 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-01-31 5:47 UTC (permalink / raw
To: gentoo-commits
robbat2 10/01/31 05:47:22
Modified: mysql.eclass
Log:
Fix QA warning: "EXPORT_FUNCTIONS is called before inherit in mysql.eclass."
Revision Changes Path
1.126 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.125&r2=1.126
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.125
retrieving revision 1.126
diff -p -w -b -B -u -u -r1.125 -r1.126
--- mysql.eclass 31 Jan 2010 05:00:43 -0000 1.125
+++ mysql.eclass 31 Jan 2010 05:47:21 -0000 1.126
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.125 2010/01/31 05:00:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.126 2010/01/31 05:47:21 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -20,6 +20,17 @@ WANT_AUTOMAKE="latest"
inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
+if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
+ EGIT_PROJECT=mysql-extras
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+ inherit git
+fi
+
case "${EAPI:-0}" in
2)
EXPORT_FUNCTIONS pkg_setup \
@@ -42,17 +53,6 @@ case "${EAPI:-0}" in
die "Unsupported EAPI: ${EAPI}" ;;
esac
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
- EGIT_PROJECT=mysql-extras
- EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
- inherit git
-fi
-
# @ECLASS-VARIABLE: MYSQL_VERSION_ID
# @DESCRIPTION:
# MYSQL_VERSION_ID will be:
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-02-01 1:07 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-02-01 1:07 UTC (permalink / raw
To: gentoo-commits
robbat2 10/02/01 01:07:09
Modified: mysql.eclass
Log:
Fixup disabling tests for 5.1 and also gcc-version usage.
Revision Changes Path
1.127 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.126&r2=1.127
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.126
retrieving revision 1.127
diff -p -w -b -B -u -u -r1.126 -r1.127
--- mysql.eclass 31 Jan 2010 05:47:21 -0000 1.126
+++ mysql.eclass 1 Feb 2010 01:07:08 -0000 1.127
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.126 2010/01/31 05:47:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.127 2010/02/01 01:07:08 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -18,7 +18,7 @@
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
-inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
+inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
@@ -209,11 +209,42 @@ mysql_version_is_at_least "5.1.26" \
# @DESCRIPTION:
# Helper function to disable specific tests.
mysql_disable_test() {
- local testname="${1}" ; shift
- local reason="${@}"
- local mysql_disable_file="${S}/mysql-test/t/disabled.def"
+ local rawtestname testname testsuite reason mysql_disable_file
+ rawtestname="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+ testsuite="${rawtestname/.*}"
+ testname="${rawtestname/*.}"
+ mysql_disable_file="${S}/mysql-test/t/disabled.def"
+ einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
echo ${testname} : ${reason} >> "${mysql_disable_file}"
- ewarn "test '${testname}' disabled: '${reason}'"
+
+ # ${S}/mysql-tests/t/disabled.def
+ #
+ # ${S}/mysql-tests/suite/federated/disabled.def
+ #
+ # ${S}/mysql-tests/suite/jp/t/disabled.def
+ # ${S}/mysql-tests/suite/ndb/t/disabled.def
+ # ${S}/mysql-tests/suite/rpl/t/disabled.def
+ # ${S}/mysql-tests/suite/parts/t/disabled.def
+ # ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
+ # ${S}/mysql-tests/suite/ndb_team/t/disabled.def
+ # ${S}/mysql-tests/suite/binlog/t/disabled.def
+ # ${S}/mysql-tests/suite/innodb/t/disabled.def
+ if [ -n "${testsuite}" ]; then
+ for mysql_disable_file in \
+ ${S}/mysql-test/suite/${testsuite}/disabled.def \
+ ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
+ FAILED ; do
+ [ -f "${mysql_disable_file}" ] && break
+ done
+ if [ "${mysql_disabled_file}" != "FAILED" ]; then
+ echo "${testname} : ${reason}" >> "${mysql_disable_file}"
+ else
+ ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+ fi
+ fi
}
# @FUNCTION: mysql_init_vars
@@ -555,7 +586,7 @@ mysql_pkg_setup() {
# Bug #290570 fun. Upstream made us need a fairly new GCC4.
if mysql_version_is_at_least "5.0.83" ; then
- GCC_VER=$(gcc_version)
+ GCC_VER=$(gcc-version)
case ${GCC_VER} in
2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;;
esac
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-02-01 19:16 Hanno Boeck (hanno)
0 siblings, 0 replies; 79+ messages in thread
From: Hanno Boeck (hanno) @ 2010-02-01 19:16 UTC (permalink / raw
To: gentoo-commits
hanno 10/02/01 19:16:06
Modified: mysql.eclass
Log:
adjust mysql.eclass to support 5.4/5.5
Revision Changes Path
1.128 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.128&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.128&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.127&r2=1.128
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mysql.eclass 1 Feb 2010 01:07:08 -0000 1.127
+++ mysql.eclass 1 Feb 2010 19:16:06 -0000 1.128
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.127 2010/02/01 01:07:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.128 2010/02/01 19:16:06 hanno Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -85,7 +85,7 @@
MYSQL_COMMUNITY_FEATURES=1
elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.4}" != "${PV}" ]; then
+elif [ "${PV#5.4}" != "${PV}" ] || [ "${PV#5.4}" != "${PV}" ]; then
MYSQL_COMMUNITY_FEATURES=1
else
MYSQL_COMMUNITY_FEATURES=0
@@ -504,7 +504,7 @@
myconf="${myconf} --with-ndb-binlog"
fi
- if mysql_version_is_at_least "5.2" ; then
+ if [ -e "${S}/storage/falcon" ] ; then
plugins="${plugins},falcon"
fi
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-02-02 2:46 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-02-02 2:46 UTC (permalink / raw
To: gentoo-commits
robbat2 10/02/02 02:46:55
Modified: mysql.eclass
Log:
Update the 5.1 plugins list for innodb_plugin, and do not build the example engines.
Revision Changes Path
1.129 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.128&r2=1.129
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.128
retrieving revision 1.129
diff -p -w -b -B -u -u -r1.128 -r1.129
--- mysql.eclass 1 Feb 2010 19:16:06 -0000 1.128
+++ mysql.eclass 2 Feb 2010 02:46:52 -0000 1.129
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.128 2010/02/01 19:16:06 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.129 2010/02/02 02:46:52 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -489,14 +489,16 @@ configure_51() {
local plugins="csv,myisam,myisammrg,heap"
if use extraengine ; then
# like configuration=max-no-ndb, archive and example removed in 5.1.11
- plugins="${plugins},archive,blackhole,example,federated,partition"
+ # not added yet: ibmdb2i
+ # Not supporting as examples: example,daemon_example,ftexample
+ plugins="${plugins},archive,blackhole,federated,partition"
elog "Before using the Federated storage engine, please be sure to read"
elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
fi
# Upstream specifically requests that InnoDB always be built.
- plugins="${plugins},innobase"
+ plugins="${plugins},innobase,innodb_plugin"
# like configuration=max-no-ndb
if use cluster ; then
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-02-02 2:59 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-02-02 2:59 UTC (permalink / raw
To: gentoo-commits
robbat2 10/02/02 02:59:03
Modified: mysql.eclass
Log:
Refactor innodb/falcon stuff.
Revision Changes Path
1.130 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.130&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.130&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.129&r2=1.130
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.129
retrieving revision 1.130
diff -p -w -b -B -u -u -r1.129 -r1.130
--- mysql.eclass 2 Feb 2010 02:46:52 -0000 1.129
+++ mysql.eclass 2 Feb 2010 02:59:03 -0000 1.130
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.129 2010/02/02 02:46:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.130 2010/02/02 02:59:03 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -497,8 +497,12 @@ configure_51() {
elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
fi
- # Upstream specifically requests that InnoDB always be built.
- plugins="${plugins},innobase,innodb_plugin"
+ # Upstream specifically requests that InnoDB always be built:
+ # - innobase, innodb_plugin
+ # Build falcon if available for 6.x series.
+ for i in innobase innodb_plugin falcon ; do
+ [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}"
+ done
# like configuration=max-no-ndb
if use cluster ; then
@@ -506,10 +510,6 @@ configure_51() {
myconf="${myconf} --with-ndb-binlog"
fi
- if [ -e "${S}/storage/falcon" ] ; then
- plugins="${plugins},falcon"
- fi
-
myconf="${myconf} --with-plugins=${plugins}"
}
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-02-02 3:01 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-02-02 3:01 UTC (permalink / raw
To: gentoo-commits
robbat2 10/02/02 03:01:31
Modified: mysql.eclass
Log:
Disable debug line.
Revision Changes Path
1.131 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.130&r2=1.131
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.130
retrieving revision 1.131
diff -p -w -b -B -u -u -r1.130 -r1.131
--- mysql.eclass 2 Feb 2010 02:59:03 -0000 1.130
+++ mysql.eclass 2 Feb 2010 03:01:31 -0000 1.131
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.130 2010/02/02 02:59:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.131 2010/02/02 03:01:31 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -217,7 +217,7 @@ mysql_disable_test() {
testsuite="${rawtestname/.*}"
testname="${rawtestname/*.}"
mysql_disable_file="${S}/mysql-test/t/disabled.def"
- einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+ #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
echo ${testname} : ${reason} >> "${mysql_disable_file}"
# ${S}/mysql-tests/t/disabled.def
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-02-02 22:16 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-02-02 22:16 UTC (permalink / raw
To: gentoo-commits
robbat2 10/02/02 22:16:04
Modified: mysql.eclass
Log:
Missed a commit to the eclass.
Revision Changes Path
1.132 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.131&r2=1.132
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.131
retrieving revision 1.132
diff -p -w -b -B -u -u -r1.131 -r1.132
--- mysql.eclass 2 Feb 2010 03:01:31 -0000 1.131
+++ mysql.eclass 2 Feb 2010 22:16:04 -0000 1.132
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.131 2010/02/02 03:01:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.132 2010/02/02 22:16:04 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -85,7 +85,11 @@ elif [ "${PV#5.0}" != "${PV}" ] && mysql
MYSQL_COMMUNITY_FEATURES=1
elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.4}" != "${PV}" ] || [ "${PV#5.4}" != "${PV}" ]; then
+elif [ "${PV#5.4}" != "${PV}" ] ; then
+ MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#5.5}" != "${PV}" ] ; then
+ MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#6.0}" != "${PV}" ] ; then
MYSQL_COMMUNITY_FEATURES=1
else
MYSQL_COMMUNITY_FEATURES=0
@@ -136,12 +140,13 @@ PDEPEND="${PDEPEND} =virtual/mysql-$(get
# Work out the default SERVER_URI correctly
if [ -z "${SERVER_URI}" ]; then
+ [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
# The community build is on the mirrors
if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
- SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
+ SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz"
# The (old) enterprise source is on the primary site only
elif [ "${PN}" == "mysql" ]; then
- SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
+ SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
fi
fi
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-02-21 0:18 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-02-21 0:18 UTC (permalink / raw
To: gentoo-commits
robbat2 10/02/21 00:18:16
Modified: mysql.eclass
Log:
Import fixes from MySQL overlay:
- mysql-cluster warning for NDB support moving per upstream
- QA fixes per bug #305873:
- Update some 5.1 configure flags that have changed
- Correct USE of pbxt/xtradb to avoid QA warnings
- USE=test controls installing tests for end-user usage
- -fPIC fixes for innodb_plugin
- consistent test location.
- COPYING doc.
Revision Changes Path
1.133 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.133&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.133&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.132&r2=1.133
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.132
retrieving revision 1.133
diff -p -w -b -B -u -u -r1.132 -r1.133
--- mysql.eclass 2 Feb 2010 22:16:04 -0000 1.132
+++ mysql.eclass 21 Feb 2010 00:18:16 -0000 1.133
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.132 2010/02/02 22:16:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.133 2010/02/21 00:18:16 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -160,25 +160,11 @@ SRC_URI="${SERVER_URI}"
http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-# PBXT engine
-mysql_version_is_at_least "5.1.12" \
-&& [[ -n "${PBXT_VERSION}" ]] \
-&& PBXT_P="pbxt-${PBXT_VERSION}" \
-&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
-&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
-
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-mysql_version_is_at_least "5.1.26" \
-&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
-&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
-&& XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
-&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )"
-
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
HOMEPAGE="http://www.mysql.com/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static"
+IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
mysql_version_is_at_least "4.1" \
&& IUSE="${IUSE} latin1"
@@ -195,17 +181,25 @@ mysql_version_is_at_least "5.0.18" \
mysql_version_is_at_least "5.1" \
|| IUSE="${IUSE} berkdb"
+[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
+&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
+
+# PBXT engine
mysql_version_is_at_least "5.1.12" \
&& [[ -n "${PBXT_VERSION}" ]] \
+&& PBXT_P="pbxt-${PBXT_VERSION}" \
+&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
+&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
&& IUSE="${IUSE} pbxt"
+# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
mysql_version_is_at_least "5.1.26" \
&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
+&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
+&& XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
+&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )" \
&& IUSE="${IUSE} xtradb"
-[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
-&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
-
#
# HELPER FUNCTIONS:
#
@@ -484,8 +478,7 @@ configure_51() {
myconf="${myconf} --enable-assembler"
myconf="${myconf} --with-geometry"
myconf="${myconf} --with-readline"
- myconf="${myconf} --with-row-based-replication"
- myconf="${myconf} --with-zlib=/usr/$(get_libdir)"
+ myconf="${myconf} --with-zlib-dir=/usr/"
myconf="${myconf} --without-pstack"
use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
@@ -518,6 +511,20 @@ configure_51() {
myconf="${myconf} --with-plugins=${plugins}"
}
+xtradb_applicable() {
+ mysql_version_is_at_least "5.1.26" \
+ && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
+ && use xtradb
+ return $?
+}
+
+pbxt_applicable() {
+ mysql_version_is_at_least "5.1.12" \
+ && [[ -n "${PBXT_VERSION}" ]] \
+ && use pbxt
+ return $?
+}
+
pbxt_src_configure() {
mysql_init_vars
@@ -606,6 +613,16 @@ mysql_pkg_setup() {
mysql_check_version_range "4.0 to 5.0.99.99" \
&& use berkdb \
&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
+
+ if [ "${PN}" != "mysql-cluster" ] && use cluster; then
+ ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
+ ewarn "5.1 series should NOT be put into production. In the near"
+ ewarn "future, it will be disabled from building."
+ ewarn ""
+ ewarn "If you need NDB support, you should instead move to the new"
+ ewarn "mysql-cluster package that represents that upstream NDB"
+ ewarn "development."
+ fi
}
# @FUNCTION: mysql_src_unpack
@@ -644,6 +661,10 @@ mysql_src_prepare() {
# And apply
epatch
+ # last -fPIC fixup, per bug #305873
+ i="${S}"/storage/innodb_plugin/plug.in
+ [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
+
# Additional checks, remove bundled zlib
rm -f "${S}/zlib/"*.[ch]
sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
@@ -666,7 +687,7 @@ mysql_src_prepare() {
local rebuilddirlist d
- if mysql_version_is_at_least "5.1.26" && use xtradb ; then
+ if xtradb_applicable ; then
einfo "Replacing InnoDB with Percona XtraDB"
pushd "${S}"/storage
i="innobase"
@@ -780,7 +801,7 @@ mysql_src_configure() {
-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
if [[ $EAPI == 2 ]]; then
- mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure
+ pbxt_applicable && pbxt_src_configure
fi
}
@@ -796,7 +817,7 @@ mysql_src_compile() {
emake || die "emake failed"
- mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
+ pbxt_applicable && pbxt_src_compile
}
# @FUNCTION: mysql_src_install
@@ -806,9 +827,13 @@ mysql_src_install() {
# Make sure the vars are correctly initialized
mysql_init_vars
- emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
+ emake install \
+ DESTDIR="${D}" \
+ benchdir_root="${MY_SHAREDSTATEDIR}" \
+ testroot="${MY_SHAREDSTATEDIR}" \
+ || die "emake install failed"
- mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
+ pbxt_applicable && pbxt_src_install
# Convenience links
einfo "Making Convenience links for mysqlcheck multi-call binary"
@@ -822,7 +847,7 @@ mysql_src_install() {
for removeme in "mysql-log-rotate" mysql.server* \
binary-configure* my-*.cnf mi_test_all*
do
- rm -f "${D}"/usr/share/mysql/${removeme}
+ rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
done
# Clean up stuff for a minimal build
@@ -834,6 +859,13 @@ mysql_src_install() {
rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
fi
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if use !test ; then
+ rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+ fi
+
# Configuration stuff
if mysql_version_is_at_least "4.1" ; then
mysql_mycnf_version="4.1"
@@ -872,7 +904,7 @@ mysql_src_install() {
# Docs
einfo "Installing docs"
- dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+ dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
doinfo "${S}"/Docs/mysql.info
# Minimal builds don't have the MySQL server
@@ -948,7 +980,7 @@ mysql_pkg_postinst() {
einfo
fi
- if mysql_version_is_at_least "5.1.12" && use pbxt ; then
+ if pbxt_applicable ; then
# TODO: explain it better
elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-02-27 18:21 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-02-27 18:21 UTC (permalink / raw
To: gentoo-commits
robbat2 10/02/27 18:21:36
Modified: mysql.eclass
Log:
Fixup more pbxt and xtradb issues, and try to fix dodoc QA.
Revision Changes Path
1.134 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.133&r2=1.134
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.133
retrieving revision 1.134
diff -p -w -b -B -u -u -r1.133 -r1.134
--- mysql.eclass 21 Feb 2010 00:18:16 -0000 1.133
+++ mysql.eclass 27 Feb 2010 18:21:35 -0000 1.134
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.133 2010/02/21 00:18:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.134 2010/02/27 18:21:35 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -188,7 +188,7 @@ mysql_version_is_at_least "5.1" \
mysql_version_is_at_least "5.1.12" \
&& [[ -n "${PBXT_VERSION}" ]] \
&& PBXT_P="pbxt-${PBXT_VERSION}" \
-&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
+&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
&& IUSE="${IUSE} pbxt"
@@ -196,8 +196,10 @@ mysql_version_is_at_least "5.1.12" \
mysql_version_is_at_least "5.1.26" \
&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
-&& XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
-&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )" \
+&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
+&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \
+&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
+&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \
&& IUSE="${IUSE} xtradb"
#
@@ -534,7 +536,7 @@ pbxt_src_configure() {
AT_GNUCONF_UPDATE="yes" eautoreconf
local myconf=""
- myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
+ myconf="${myconf} --with-mysql=${S} --libdir=${MY_LIBDIR}"
use debug && myconf="${myconf} --with-debug=full"
# TODO: is it safe/needed to use econf here ?
./configure ${myconf} || die "Problem configuring PBXT storage engine"
@@ -554,7 +556,7 @@ pbxt_src_compile() {
pbxt_src_install() {
pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
- make install || die "Failed to install PBXT"
+ emake install DESTDIR="${D}" || die "Failed to install PBXT"
popd
}
@@ -693,21 +695,22 @@ mysql_src_prepare() {
i="innobase"
o="${WORKDIR}/storage-${i}.mysql-upstream"
# Have we been here already?
- [ -h "${i}" ] && rm -f "${i}"
+ [ -d "${o}" ] && rm -f "${i}"
# Or maybe we haven't
[ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
- ln -s "${WORKDIR}/${XTRADB_P}" "${i}"
+ cp -ra "${WORKDIR}/${XTRADB_P}" "${i}"
popd
fi
if mysql_version_is_at_least "5.1.12" ; then
- einfo "Updating innobase cmake"
rebuilddirlist="."
- # TODO: check this with a cmake expert
- cmake \
- -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
- -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
- "storage/innobase"
+ # This does not seem to be needed presently. robbat2 2010/02/23
+ #einfo "Updating innobase cmake"
+ ## TODO: check this with a cmake expert
+ #cmake \
+ # -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
+ # -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
+ # "storage/innobase"
else
rebuilddirlist=". innobase"
fi
@@ -916,12 +919,12 @@ mysql_src_install() {
"${S}"/support-files/magic \
"${S}"/support-files/ndb-config-2-node.ini
do
- dodoc "${script}"
+ [[ -f "$script" ]] && dodoc "${script}"
done
docinto "scripts"
for script in "${S}"/scripts/mysql* ; do
- [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+ [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
done
fi
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-03 23:57 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-03 23:57 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/03 23:57:14
Modified: mysql.eclass
Log:
Bug #307641: Fix accidental default SSL implementation change of OpenSSL->YaSSL back to OpenSSL.
Revision Changes Path
1.135 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.134&r2=1.135
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.134
retrieving revision 1.135
diff -p -w -b -B -u -u -r1.134 -r1.135
--- mysql.eclass 27 Feb 2010 18:21:35 -0000 1.134
+++ mysql.eclass 3 Mar 2010 23:57:13 -0000 1.135
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.134 2010/02/27 18:21:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.135 2010/03/03 23:57:13 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -407,7 +407,7 @@ configure_40_41_50() {
fi
if mysql_version_is_at_least "5.1.11" ; then
- myconf="${myconf} $(use_with ssl)"
+ myconf="${myconf} $(use_with ssl /usr)"
else
myconf="${myconf} $(use_with ssl openssl)"
fi
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-09 20:37 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-09 20:37 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/09 20:37:35
Modified: mysql.eclass
Log:
Bug 307641: more fixes to SSL configure options. Also add community/profiling features to 5.1 properly and clean up a dead SSL configure codepath in configure_40_41_50.
Revision Changes Path
1.136 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.135&r2=1.136
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.135
retrieving revision 1.136
diff -p -w -b -B -u -u -r1.135 -r1.136
--- mysql.eclass 3 Mar 2010 23:57:13 -0000 1.135
+++ mysql.eclass 9 Mar 2010 20:37:34 -0000 1.136
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.135 2010/03/03 23:57:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.136 2010/03/09 20:37:34 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -398,20 +398,16 @@ configure_40_41_50() {
myconf="${myconf} --with-extra-tools"
myconf="${myconf} --with-innodb"
myconf="${myconf} --without-readline"
+ myconf="${myconf} $(use_with ssl openssl)"
mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
# --with-vio is not needed anymore, it's on by default and
# has been removed from configure
+ # Apply to 4.x and 5.0.[0-3]
if use ssl ; then
mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
fi
- if mysql_version_is_at_least "5.1.11" ; then
- myconf="${myconf} $(use_with ssl /usr)"
- else
- myconf="${myconf} $(use_with ssl openssl)"
- fi
-
if mysql_version_is_at_least "5.0.60" ; then
if use berkdb ; then
elog "Berkeley DB support was disabled due to build failures"
@@ -476,13 +472,21 @@ configure_51() {
# TODO: !!!! readd --without-readline
# the failure depend upon config/ac-macros/readline.m4 checking into
# readline.h instead of history.h
- myconf="${myconf} $(use_with ssl)"
+ myconf="${myconf} $(use_with ssl ssl /usr)"
myconf="${myconf} --enable-assembler"
myconf="${myconf} --with-geometry"
myconf="${myconf} --with-readline"
myconf="${myconf} --with-zlib-dir=/usr/"
myconf="${myconf} --without-pstack"
use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
+ if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
+ myconf="${myconf} $(use_enable community community-features)"
+ if use community; then
+ myconf="${myconf} $(use_enable profiling)"
+ else
+ myconf="${myconf} --disable-profiling"
+ fi
+ fi
# 5.1 introduces a new way to manage storage engines (plugins)
# like configuration=none
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-15 18:50 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-15 18:50 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/15 18:50:44
Modified: mysql.eclass
Log:
Merge Overlay changes for MariaDB.
Revision Changes Path
1.137 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.137&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.137&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.136&r2=1.137
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.136
retrieving revision 1.137
diff -p -w -b -B -u -u -r1.136 -r1.137
--- mysql.eclass 9 Mar 2010 20:37:34 -0000 1.136
+++ mysql.eclass 15 Mar 2010 18:50:43 -0000 1.137
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.136 2010/03/09 20:37:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.137 2010/03/15 18:50:43 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -53,6 +53,14 @@ case "${EAPI:-0}" in
die "Unsupported EAPI: ${EAPI}" ;;
esac
+
+# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
+# @DESCRIPTION:
+# Upstream MySQL considers the first two parts of the version number to be the
+# major version. Upgrades that change major version should always run
+# mysql_upgrade.
+MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
+
# @ECLASS-VARIABLE: MYSQL_VERSION_ID
# @DESCRIPTION:
# MYSQL_VERSION_ID will be:
@@ -79,7 +87,7 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"
# and 0 (no).
# Community features are available in mysql-community
# AND in the re-merged mysql-5.0.82 and newer
-if [ "${PN}" == "mysql-community" ]; then
+if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
MYSQL_COMMUNITY_FEATURES=1
elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
MYSQL_COMMUNITY_FEATURES=1
@@ -114,10 +122,13 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d
>=sys-libs/readline-4.1
>=sys-libs/zlib-1.2.3"
+[[ "${PN}" == "mariadb" ]] \
+&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
+
# Having different flavours at the same time is not a good idea
-for i in "" "-community" ; do
- [[ "${i}" == ${PN#mysql} ]] ||
- DEPEND="${DEPEND} !dev-db/mysql${i}"
+for i in "mysql" "mysql-community" "mariadb" ; do
+ [[ "${i}" == ${PN} ]] ||
+ DEPEND="${DEPEND} !dev-db/${i}"
done
RDEPEND="${DEPEND}
@@ -136,13 +147,16 @@ mysql_version_is_at_least "5.1.12" \
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
# For other stuff to bring us in
-PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
+PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
# Work out the default SERVER_URI correctly
if [ -z "${SERVER_URI}" ]; then
[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
+ if [ "${PN}" == "mariadb" ]; then
+ MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
+ SERVER_URI="http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/mariadb-${MARIA_FULL_PV}.tar.gz"
# The community build is on the mirrors
- if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
+ elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz"
# The (old) enterprise source is on the primary site only
elif [ "${PN}" == "mysql" ]; then
@@ -162,6 +176,10 @@ SRC_URI="${SERVER_URI}"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
HOMEPAGE="http://www.mysql.com/"
+if [[ "${PN}" == "mariadb" ]]; then
+ HOMEPAGE="http://askmonty.org/"
+ DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
+fi
LICENSE="GPL-2"
SLOT="0"
IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
@@ -184,17 +202,44 @@ mysql_version_is_at_least "5.1" \
[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
-# PBXT engine
-mysql_version_is_at_least "5.1.12" \
-&& [[ -n "${PBXT_VERSION}" ]] \
+[[ "${PN}" == "mariadb" ]] \
+&& IUSE="${IUSE} libevent"
+
+# MariaDB has integrated PBXT
+# PBXT_VERSION means that we have a PBXT patch for this PV
+# PBXT was only introduced after 5.1.12
+pbxt_patch_available() {
+ [[ "${PN}" != "mariadb" ]] \
+ && mysql_version_is_at_least "5.1.12" \
+ && [[ -n "${PBXT_VERSION}" ]]
+ return $?
+}
+
+pbxt_available() {
+ pbxt_patch_available || [[ "${PN}" == "mariadb" ]]
+ return $?
+}
+
+# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
+# MariaDB has integrated XtraDB
+# XTRADB_VERS means that we have a XTRADB patch for this PV
+# XTRADB was only introduced after 5.1.26
+xtradb_patch_available() {
+ [[ "${PN}" != "mariadb" ]] \
+ && mysql_version_is_at_least "5.1.26" \
+ && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
+ return $?
+}
+
+pbxt_patch_available \
&& PBXT_P="pbxt-${PBXT_VERSION}" \
&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
+
+pbxt_available \
&& IUSE="${IUSE} pbxt"
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-mysql_version_is_at_least "5.1.26" \
-&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
+xtradb_patch_available \
&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \
@@ -497,8 +542,13 @@ configure_51() {
# Not supporting as examples: example,daemon_example,ftexample
plugins="${plugins},archive,blackhole,federated,partition"
+ if [[ "${PN}" != "mariadb" ]] ; then
elog "Before using the Federated storage engine, please be sure to read"
elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
+ else
+ elog "MariaDB includes the FederatedX engine. Be sure to read"
+ elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
+ fi
fi
# Upstream specifically requests that InnoDB always be built:
@@ -514,21 +564,22 @@ configure_51() {
myconf="${myconf} --with-ndb-binlog"
fi
- myconf="${myconf} --with-plugins=${plugins}"
-}
-
-xtradb_applicable() {
- mysql_version_is_at_least "5.1.26" \
- && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
- && use xtradb
- return $?
-}
+ if [[ "${PN}" == "mariadb" ]] ; then
+ # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
+ # caught above.
+ plugins="${plugins},maria,innobase"
+ if use pbxt ; then
+ plugins="${plugins},pbxt"
+ else
+ myconf="${myconf} --without-plugin-pbxt"
+ fi
+ myconf="${myconf} $(use_with libevent)"
+ # This is not optional, without it several upstream testcases fail.
+ # Also strongly recommended by upstream.
+ myconf="${myconf} --with-maria-tmp-tables"
+ fi
-pbxt_applicable() {
- mysql_version_is_at_least "5.1.12" \
- && [[ -n "${PBXT_VERSION}" ]] \
- && use pbxt
- return $?
+ myconf="${myconf} --with-plugins=${plugins}"
}
pbxt_src_configure() {
@@ -693,7 +744,7 @@ mysql_src_prepare() {
local rebuilddirlist d
- if xtradb_applicable ; then
+ if xtradb_patch_available && use xtradb ; then
einfo "Replacing InnoDB with Percona XtraDB"
pushd "${S}"/storage
i="innobase"
@@ -808,7 +859,7 @@ mysql_src_configure() {
-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
if [[ $EAPI == 2 ]]; then
- pbxt_applicable && pbxt_src_configure
+ pbxt_patch_available && use pbxt && pbxt_src_configure
fi
}
@@ -824,7 +875,7 @@ mysql_src_compile() {
emake || die "emake failed"
- pbxt_applicable && pbxt_src_compile
+ pbxt_patch_available && use pbxt && pbxt_src_compile
}
# @FUNCTION: mysql_src_install
@@ -840,7 +891,7 @@ mysql_src_install() {
testroot="${MY_SHAREDSTATEDIR}" \
|| die "emake install failed"
- pbxt_applicable && pbxt_src_install
+ pbxt_patch_available && use pbxt && pbxt_src_install
# Convenience links
einfo "Making Convenience links for mysqlcheck multi-call binary"
@@ -972,12 +1023,15 @@ mysql_pkg_postinst() {
support-files/magic \
support-files/ndb-config-2-node.ini
do
- dodoc "${script}"
+ [[ -f "${script}" ]] \
+ && dodoc "${script}"
done
docinto "scripts"
for script in scripts/mysql* ; do
- [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+ [[ -f "${script}" ]] \
+ && [[ "${script%.sh}" == "${script}" ]] \
+ && dodoc "${script}"
done
einfo
@@ -987,7 +1041,7 @@ mysql_pkg_postinst() {
einfo
fi
- if pbxt_applicable ; then
+ if pbxt_available && use pbxt ; then
# TODO: explain it better
elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-15 19:05 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-15 19:05 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/15 19:05:52
Modified: mysql.eclass
Log:
Bug #308491: Fix PBXT install location and econf usage.
Revision Changes Path
1.138 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.137&r2=1.138
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.137
retrieving revision 1.138
diff -p -w -b -B -u -u -r1.137 -r1.138
--- mysql.eclass 15 Mar 2010 18:50:43 -0000 1.137
+++ mysql.eclass 15 Mar 2010 19:05:51 -0000 1.138
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.137 2010/03/15 18:50:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.138 2010/03/15 19:05:51 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -591,10 +591,9 @@ pbxt_src_configure() {
AT_GNUCONF_UPDATE="yes" eautoreconf
local myconf=""
- myconf="${myconf} --with-mysql=${S} --libdir=${MY_LIBDIR}"
+ myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)"
use debug && myconf="${myconf} --with-debug=full"
- # TODO: is it safe/needed to use econf here ?
- ./configure ${myconf} || die "Problem configuring PBXT storage engine"
+ econf ${myconf} || die "Problem configuring PBXT storage engine"
}
pbxt_src_compile() {
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-15 19:27 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-15 19:27 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/15 19:27:05
Modified: mysql.eclass
Log:
Comment about which engines are meant to be built in.
Revision Changes Path
1.139 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.139&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.139&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.138&r2=1.139
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.138
retrieving revision 1.139
diff -p -w -b -B -u -u -r1.138 -r1.139
--- mysql.eclass 15 Mar 2010 19:05:51 -0000 1.138
+++ mysql.eclass 15 Mar 2010 19:27:04 -0000 1.139
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.138 2010/03/15 19:05:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.139 2010/03/15 19:27:04 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -535,6 +535,7 @@ configure_51() {
# 5.1 introduces a new way to manage storage engines (plugins)
# like configuration=none
+ # This base set are required, and will always be statically built.
local plugins="csv,myisam,myisammrg,heap"
if use extraengine ; then
# like configuration=max-no-ndb, archive and example removed in 5.1.11
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-24 3:09 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-24 3:09 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/24 03:09:08
Modified: mysql.eclass
Log:
Last commit in the latest round of mysql changes: pkg_config now checks for options before disabling them during setup to avoid more zealous error checking from upstream.
Revision Changes Path
1.140 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.140&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.140&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.139&r2=1.140
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.139
retrieving revision 1.140
diff -p -w -b -B -u -u -r1.139 -r1.140
--- mysql.eclass 15 Mar 2010 19:27:04 -0000 1.139
+++ mysql.eclass 24 Mar 2010 03:09:08 -0000 1.140
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.139 2010/03/15 19:27:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.140 2010/03/24 03:09:08 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -925,7 +925,9 @@ mysql_src_install() {
fi
# Configuration stuff
- if mysql_version_is_at_least "4.1" ; then
+ if mysql_version_is_at_least "5.1" ; then
+ mysql_mycnf_version="5.1"
+ elif mysql_version_is_at_least "4.1" ; then
mysql_mycnf_version="4.1"
else
mysql_mycnf_version="4.0"
@@ -937,7 +939,9 @@ mysql_src_install() {
"${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
> "${TMPDIR}/my.cnf.ok"
if mysql_version_is_at_least "4.1" && use latin1 ; then
- sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok"
fi
newins "${TMPDIR}/my.cnf.ok" my.cnf
@@ -1102,7 +1106,8 @@ mysql_pkg_config() {
local pwd1="a"
local pwd2="b"
- local maxtry=5
+ local MYSQL_ROOT_PASSWORD=''
+ local maxtry=15
if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
ewarn "You have already a MySQL database in place."
@@ -1115,10 +1120,10 @@ mysql_pkg_config() {
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
- einfo "Creating the mysql database and setting proper"
- einfo "permissions on it ..."
+ if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
- einfo "Insert a password for the mysql 'root' user"
+ einfo "Please provide a password for the mysql 'root' user now,"
+ einfo "or in the MYSQL_ROOT_PASSWORD env var."
ewarn "Avoid [\"'\\_%] characters in the password"
read -rsp " >" pwd1 ; echo
@@ -1128,6 +1133,9 @@ mysql_pkg_config() {
if [[ "x$pwd1" != "x$pwd2" ]] ; then
die "Passwords are not the same"
fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+ fi
local options=""
local sqltmp="$(emktemp)"
@@ -1150,9 +1158,20 @@ mysql_pkg_config() {
chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
- if mysql_version_is_at_least "4.1.3" ; then
- options="--skip-ndbcluster"
+ # Figure out which options we need to disable to do the setup
+ helpfile="${TMPDIR}/mysqld-help"
+ ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
+ for opt in grant-tables host-cache name-resolve networking slave-start bdb \
+ federated innodb ssl log-bin relay-log slow-query-log external-locking \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
+ egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ done
+ # But some options changed names
+ egrep -sq external-locking "${helpfile}" && \
+ options="${options/skip-locking/skip-external-locking}"
+ if mysql_version_is_at_least "4.1.3" ; then
# Filling timezones, see
# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
@@ -1162,48 +1181,59 @@ mysql_pkg_config() {
fi
fi
+ einfo "Creating the mysql database and setting proper"
+ einfo "permissions on it ..."
+
local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
local mysqld="${ROOT}/usr/sbin/mysqld \
${options} \
--user=mysql \
- --skip-grant-tables \
--basedir=${ROOT}/usr \
--datadir=${ROOT}/${MY_DATADIR} \
- --skip-innodb \
- --skip-bdb \
- --skip-networking \
--max_allowed_packet=8M \
--net_buffer_length=16K \
--socket=${socket} \
--pid-file=${pidfile}"
+ #einfo "About to start mysqld: ${mysqld}"
+ ebegin "Starting mysqld"
${mysqld} &
+ rc=$?
while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
maxtry=$((${maxtry}-1))
echo -n "."
sleep 1
done
+ eend $rc
+
+ if ! [[ -S "${socket}" ]]; then
+ die "Completely failed to start up mysqld with: ${mysqld}"
+ fi
+ ebegin "Setting root password"
# Do this from memory, as we don't want clear text passwords in temp files
- local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
+ local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
"${ROOT}/usr/bin/mysql" \
--socket=${socket} \
-hlocalhost \
-e "${sql}"
+ eend $?
- einfo "Loading \"zoneinfo\", this step may require a few seconds ..."
-
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
"${ROOT}/usr/bin/mysql" \
--socket=${socket} \
-hlocalhost \
-uroot \
- -p"${pwd1}" \
+ -p"${MYSQL_ROOT_PASSWORD}" \
mysql < "${sqltmp}"
+ rc=$?
+ eend $?
+ [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
# Stop the server and cleanup
+ einfo "Stopping the server ..."
kill $(< "${pidfile}" )
rm -f "${sqltmp}"
- einfo "Stopping the server ..."
wait %1
einfo "Done"
}
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-24 3:45 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-24 3:45 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/24 03:45:56
Modified: mysql.eclass
Log:
Bug #278633: add in support for mysql root password from secure config file.
Revision Changes Path
1.141 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.140&r2=1.141
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.140
retrieving revision 1.141
diff -p -w -b -B -u -u -r1.140 -r1.141
--- mysql.eclass 24 Mar 2010 03:09:08 -0000 1.140
+++ mysql.eclass 24 Mar 2010 03:45:56 -0000 1.141
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.140 2010/03/24 03:09:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.141 2010/03/24 03:45:56 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -1109,6 +1109,10 @@ mysql_pkg_config() {
local MYSQL_ROOT_PASSWORD=''
local maxtry=15
+ if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
+ MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")"
+ fi
+
if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
ewarn "You have already a MySQL database in place."
ewarn "(${ROOT}/${MY_DATADIR}/*)"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-24 20:37 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-24 20:37 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/24 20:37:54
Modified: mysql.eclass
Log:
Bug #303555: mysql-community users should switch to dev-db/mysql properly.
Revision Changes Path
1.142 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.141&r2=1.142
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.141
retrieving revision 1.142
diff -p -w -b -B -u -u -r1.141 -r1.142
--- mysql.eclass 24 Mar 2010 03:45:56 -0000 1.141
+++ mysql.eclass 24 Mar 2010 20:37:54 -0000 1.142
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.141 2010/03/24 03:45:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.142 2010/03/24 20:37:54 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -180,6 +180,9 @@ if [[ "${PN}" == "mariadb" ]]; then
HOMEPAGE="http://askmonty.org/"
DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
fi
+if [[ "${PN}" == "mysql-community" ]]; then
+ DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
+fi
LICENSE="GPL-2"
SLOT="0"
IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-03-25 20:58 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-03-25 20:58 UTC (permalink / raw
To: gentoo-commits
robbat2 10/03/25 20:58:31
Modified: mysql.eclass
Log:
Bug #310787: If a user has default-storage-engine in their config, we need to override it during setup to create the internal mysql tables safely.
Revision Changes Path
1.143 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.143&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.143&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.142&r2=1.143
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.142
retrieving revision 1.143
diff -p -w -b -B -u -u -r1.142 -r1.143
--- mysql.eclass 24 Mar 2010 20:37:54 -0000 1.142
+++ mysql.eclass 25 Mar 2010 20:58:31 -0000 1.143
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.142 2010/03/24 20:37:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.143 2010/03/25 20:58:31 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -1200,6 +1200,7 @@ mysql_pkg_config() {
--datadir=${ROOT}/${MY_DATADIR} \
--max_allowed_packet=8M \
--net_buffer_length=16K \
+ --default-storage-engine=MyISAM \
--socket=${socket} \
--pid-file=${pidfile}"
#einfo "About to start mysqld: ${mysqld}"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-04-01 20:36 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-04-01 20:36 UTC (permalink / raw
To: gentoo-commits
robbat2 10/04/01 20:36:39
Modified: mysql.eclass
Log:
Followup on bug #284946, #293801, #310615, #307251: In 5.0.87, the mutex locking code was changed a lot again, so that while 5.0.84 required a newer GCC due to the HAVE_ATOMIC_BUILTINS error, newer releases do NOT need those GCC versions anymore. This also frees up ~hppa to do more stabilization.
Revision Changes Path
1.144 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.143&r2=1.144
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.143
retrieving revision 1.144
diff -p -w -b -B -u -u -r1.143 -r1.144
--- mysql.eclass 25 Mar 2010 20:58:31 -0000 1.143
+++ mysql.eclass 1 Apr 2010 20:36:39 -0000 1.144
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.143 2010/03/25 20:58:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.144 2010/04/01 20:36:39 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -658,11 +658,17 @@ mysql_pkg_setup() {
die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
fi
- # Bug #290570 fun. Upstream made us need a fairly new GCC4.
- if mysql_version_is_at_least "5.0.83" ; then
+ # Bug #290570, 284946, 307251
+ # Upstream changes made us need a fairly new GCC4.
+ # But only for 5.0.8[3-6]!
+ if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
GCC_VER=$(gcc-version)
case ${GCC_VER} in
- 2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;;
+ 2*|3*|4.0|4.1|4.2)
+ eerror "Some releases of MySQL required a very new GCC, and then"
+ eerror "later release relaxed that requirement again. Either pick a"
+ eerror "MySQL >=5.0.87, or use a newer GCC."
+ die "Active GCC too old!" ;;
esac
fi
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-04-27 5:45 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-04-27 5:45 UTC (permalink / raw
To: gentoo-commits
robbat2 10/04/27 05:45:55
Modified: mysql.eclass
Log:
Fix up MariaDB SRC_URI. Building for PBXT and XtraDB. Radically improve plugin handling.
Revision Changes Path
1.145 eclass/mysql.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.144&r2=1.145
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.144
retrieving revision 1.145
diff -p -w -b -B -u -u -r1.144 -r1.145
--- mysql.eclass 1 Apr 2010 20:36:39 -0000 1.144
+++ mysql.eclass 27 Apr 2010 05:45:55 -0000 1.145
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.144 2010/04/01 20:36:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.145 2010/04/27 05:45:55 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -154,7 +154,12 @@ if [ -z "${SERVER_URI}" ]; then
[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
if [ "${PN}" == "mariadb" ]; then
MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
- SERVER_URI="http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/mariadb-${MARIA_FULL_PV}.tar.gz"
+ MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
+ SERVER_URI="
+ http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+ http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
+ http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
+ "
# The community build is on the mirrors
elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz"
@@ -239,15 +245,22 @@ pbxt_patch_available \
&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
+# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
+# vs. built outside the dir
pbxt_available \
-&& IUSE="${IUSE} pbxt"
+&& IUSE="${IUSE} pbxt" \
+&& mysql_version_is_at_least "5.1.40" \
+&& PBXT_NEWSTYLE=1
xtradb_patch_available \
&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
-&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \
-&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
-&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \
+&& XTRADB_SRC_B1="http://www.percona.com/" \
+&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
+&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
+&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
+&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
+&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
&& IUSE="${IUSE} xtradb"
#
@@ -526,6 +539,8 @@ configure_51() {
myconf="${myconf} --with-readline"
myconf="${myconf} --with-zlib-dir=/usr/"
myconf="${myconf} --without-pstack"
+ myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
+
use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
myconf="${myconf} $(use_enable community community-features)"
@@ -536,15 +551,45 @@ configure_51() {
fi
fi
+ # Scan for all available plugins
+ local plugins_avail="$(
+ LANG=C \
+ find "${S}" \
+ \( \
+ -name 'plug.in' \
+ -o -iname 'configure.in' \
+ -o -iname 'configure.ac' \
+ \) \
+ -print0 \
+ | xargs -0 sed -r -n \
+ -e '/^MYSQL_STORAGE_ENGINE/{
+ s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
+ s~^([^ ]+).*~\1~gp;
+ }' \
+ | tr -s '\n' ' '
+ )"
+
# 5.1 introduces a new way to manage storage engines (plugins)
# like configuration=none
# This base set are required, and will always be statically built.
- local plugins="csv,myisam,myisammrg,heap"
+ local plugins_sta="csv myisam myisammrg heap"
+ local plugins_dyn=""
+ local plugins_dis="example ibmdb2i"
+
+ # These aren't actually required by the base set, but are really useful:
+ plugins_sta="${plugins_sta} archive blackhole"
+
+ # default in 5.5.4
+ if mysql_version_is_at_least "5.5.4" ; then
+ plugins_sta="${plugins_sta} partition"
+ fi
+ # Now the extras
if use extraengine ; then
# like configuration=max-no-ndb, archive and example removed in 5.1.11
# not added yet: ibmdb2i
# Not supporting as examples: example,daemon_example,ftexample
- plugins="${plugins},archive,blackhole,federated,partition"
+ plugins_sta="${plugins_sta} partition"
+ plugins_dyn="${plugins_sta} federated"
if [[ "${PN}" != "mariadb" ]] ; then
elog "Before using the Federated storage engine, please be sure to read"
@@ -553,37 +598,59 @@ configure_51() {
elog "MariaDB includes the FederatedX engine. Be sure to read"
elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
fi
+ else
+ plugins_dis="${plugins_dis} partition federated"
fi
# Upstream specifically requests that InnoDB always be built:
# - innobase, innodb_plugin
# Build falcon if available for 6.x series.
- for i in innobase innodb_plugin falcon ; do
- [ -e "${S}"/storage/${i} ] && plugins="${plugins},${i}"
+ for i in innobase falcon ; do
+ [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
+ done
+ for i in innodb_plugin ; do
+ [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
done
# like configuration=max-no-ndb
if use cluster ; then
- plugins="${plugins},ndbcluster"
+ plugins_sta="${plugins_sta} ndbcluster"
myconf="${myconf} --with-ndb-binlog"
+ else
+ plugins_dis="${plugins_dis} ndbcluster"
fi
if [[ "${PN}" == "mariadb" ]] ; then
# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
# caught above.
- plugins="${plugins},maria,innobase"
- if use pbxt ; then
- plugins="${plugins},pbxt"
- else
- myconf="${myconf} --without-plugin-pbxt"
- fi
+ plugins_sta="${plugins_sta},maria,innobase"
myconf="${myconf} $(use_with libevent)"
# This is not optional, without it several upstream testcases fail.
# Also strongly recommended by upstream.
myconf="${myconf} --with-maria-tmp-tables"
fi
- myconf="${myconf} --with-plugins=${plugins}"
+ if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
+ use pbxt \
+ && plugins_dyn="${plugins_dyn} pbxt" \
+ || plugins_dis="${plugins_dis} pbxt"
+ fi
+
+ use static && \
+ plugins_sta="${plugins_sta} ${plugins_dyn}" && \
+ plugins_dyn=""
+
+ einfo "Available plugins: ${plugins_avail}"
+ einfo "Dynamic plugins: ${plugins_dyn}"
+ einfo "Static plugins: ${plugins_sta}"
+ einfo "Disabled plugins: ${plugins_dis}"
+
+ # These are the static plugins
+ myconf="${myconf} --with-plugins=${plugins_sta// /,}"
+ # And the disabled ones
+ for i in ${plugins_dis} ; do
+ myconf="${myconf} --without-plugin-${i}"
+ done
}
pbxt_src_configure() {
@@ -639,8 +707,9 @@ mysql_pkg_setup() {
# Check for USE flag problems in pkg_setup
if use static && use ssl ; then
- eerror "MySQL does not support being built statically with SSL support enabled!"
- die "MySQL does not support being built statically with SSL support enabled!"
+ M="MySQL does not support being built statically with SSL support enabled!"
+ eerror "${M}"
+ die "${M}"
fi
if ! mysql_version_is_at_least "5.0" \
@@ -652,10 +721,20 @@ mysql_pkg_setup() {
fi
if mysql_version_is_at_least "4.1.3" \
- && ( use cluster || use extraengine ) \
+ && ( use cluster || use extraengine || use embedded ) \
&& use minimal ; then
- eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
- die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
+ M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
+ eerror "${M}"
+ die "${M}"
+ fi
+
+ if mysql_version_is_at_least "5.1" \
+ && xtradb_patch_available \
+ && use xtradb \
+ && use embedded ; then
+ M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
+ eerror "${M}"
+ die "${M}"
fi
# Bug #290570, 284946, 307251
@@ -754,16 +833,25 @@ mysql_src_prepare() {
local rebuilddirlist d
if xtradb_patch_available && use xtradb ; then
- einfo "Replacing InnoDB with Percona XtraDB"
- pushd "${S}"/storage
+ einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
+ pushd "${S}"/storage >/dev/null
i="innobase"
o="${WORKDIR}/storage-${i}.mysql-upstream"
# Have we been here already?
[ -d "${o}" ] && rm -f "${i}"
# Or maybe we haven't
[ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
- cp -ra "${WORKDIR}/${XTRADB_P}" "${i}"
- popd
+ cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
+ popd >/dev/null
+ fi
+
+ if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
+ einfo "Adding storage engine: PBXT"
+ pushd "${S}"/storage >/dev/null
+ i='pbxt'
+ [ -d "${i}" ] && rm -rf "${i}"
+ cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
+ popd >/dev/null
fi
if mysql_version_is_at_least "5.1.12" ; then
@@ -867,7 +955,7 @@ mysql_src_configure() {
| xargs -0 -n100 sed -i \
-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
- if [[ $EAPI == 2 ]]; then
+ if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
pbxt_patch_available && use pbxt && pbxt_src_configure
fi
}
@@ -884,7 +972,9 @@ mysql_src_compile() {
emake || die "emake failed"
+ if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
pbxt_patch_available && use pbxt && pbxt_src_compile
+ fi
}
# @FUNCTION: mysql_src_install
@@ -900,7 +990,9 @@ mysql_src_install() {
testroot="${MY_SHAREDSTATEDIR}" \
|| die "emake install failed"
+ if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
pbxt_patch_available && use pbxt && pbxt_src_install
+ fi
# Convenience links
einfo "Making Convenience links for mysqlcheck multi-call binary"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-05-13 19:45 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-05-13 19:45 UTC (permalink / raw
To: gentoo-commits
robbat2 10/05/13 19:45:47
Modified: mysql.eclass
Log:
Bug #318851: USE=cluster also needs the partition engine support in 5.1.46.
Revision Changes Path
1.146 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.145&r2=1.146
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.145
retrieving revision 1.146
diff -p -w -b -B -u -u -r1.145 -r1.146
--- mysql.eclass 27 Apr 2010 05:45:55 -0000 1.145
+++ mysql.eclass 13 May 2010 19:45:47 -0000 1.146
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.145 2010/04/27 05:45:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.146 2010/05/13 19:45:47 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -614,7 +614,8 @@ configure_51() {
# like configuration=max-no-ndb
if use cluster ; then
- plugins_sta="${plugins_sta} ndbcluster"
+ plugins_sta="${plugins_sta} ndbcluster partition"
+ plugins_dis="${plugins_dis//partition}"
myconf="${myconf} --with-ndb-binlog"
else
plugins_dis="${plugins_dis} ndbcluster"
@@ -623,7 +624,7 @@ configure_51() {
if [[ "${PN}" == "mariadb" ]] ; then
# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
# caught above.
- plugins_sta="${plugins_sta},maria,innobase"
+ plugins_sta="${plugins_sta} maria innobase"
myconf="${myconf} $(use_with libevent)"
# This is not optional, without it several upstream testcases fail.
# Also strongly recommended by upstream.
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-08-08 23:31 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-08-08 23:31 UTC (permalink / raw
To: gentoo-commits
robbat2 10/08/08 23:31:05
Modified: mysql.eclass
Log:
Bring in a patch from the overlay so we can override bad tarball packaging.
Revision Changes Path
1.147 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.146&r2=1.147
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.146
retrieving revision 1.147
diff -p -w -b -B -u -u -r1.146 -r1.147
--- mysql.eclass 13 May 2010 19:45:47 -0000 1.146
+++ mysql.eclass 8 Aug 2010 23:31:05 -0000 1.147
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.146 2010/05/13 19:45:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.147 2010/08/08 23:31:05 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -367,8 +367,10 @@ mysql_init_vars() {
fi
fi
+ if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
MY_SOURCEDIR=${SERVER_URI##*/}
MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
+ fi
export MY_SHAREDSTATEDIR MY_SYSCONFDIR
export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-08-09 19:29 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-08-09 19:29 UTC (permalink / raw
To: gentoo-commits
robbat2 10/08/09 19:29:50
Modified: mysql.eclass
Log:
Upstream changed mirror layout, and moved files to an archive site that is not mirrored.
Revision Changes Path
1.148 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.148&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.148&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.147&r2=1.148
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.147
retrieving revision 1.148
diff -p -w -b -B -u -u -r1.147 -r1.148
--- mysql.eclass 8 Aug 2010 23:31:05 -0000 1.147
+++ mysql.eclass 9 Aug 2010 19:29:49 -0000 1.148
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.147 2010/08/08 23:31:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.148 2010/08/09 19:29:49 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -162,7 +162,18 @@ if [ -z "${SERVER_URI}" ]; then
"
# The community build is on the mirrors
elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
- SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz"
+ if [[ "${PN}" == "mysql-cluster" ]] ; then
+ URI_DIR="MySQL-Cluster"
+ URI_FILE="mysql-cluster-gpl"
+ else
+ URI_DIR="MySQL"
+ URI_FILE="mysql"
+ fi
+ URI_A="${URI_FILE}-${MY_PV}.tar.gz"
+ MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+ # Recently upstream switched to an archive site, and not on mirrors
+ SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
+ mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
# The (old) enterprise source is on the primary site only
elif [ "${PN}" == "mysql" ]; then
SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-08-20 23:52 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-08-20 23:52 UTC (permalink / raw
To: gentoo-commits
robbat2 10/08/20 23:52:51
Modified: mysql.eclass
Log:
Add MySQL-cluster support to the eclass. Ebuild not moving from overlay quite yet however.
Revision Changes Path
1.149 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.149&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.149&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.148&r2=1.149
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.148
retrieving revision 1.149
diff -p -w -b -B -u -u -r1.148 -r1.149
--- mysql.eclass 9 Aug 2010 19:29:49 -0000 1.148
+++ mysql.eclass 20 Aug 2010 23:52:51 -0000 1.149
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.148 2010/08/09 19:29:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.149 2010/08/20 23:52:51 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -61,6 +61,14 @@ esac
# mysql_upgrade.
MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
+# Cluster is a special case...
+if [[ "${PN}" == "mysql-cluster" ]]; then
+ case $PV in
+ 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
+ esac
+fi
+
+
# @ECLASS-VARIABLE: MYSQL_VERSION_ID
# @DESCRIPTION:
# MYSQL_VERSION_ID will be:
@@ -97,7 +105,9 @@ elif [ "${PV#5.4}" != "${PV}" ] ; then
MYSQL_COMMUNITY_FEATURES=1
elif [ "${PV#5.5}" != "${PV}" ] ; then
MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#6.0}" != "${PV}" ] ; then
+elif [ "${PV#6}" != "${PV}" ] ; then
+ MYSQL_COMMUNITY_FEATURES=1
+elif [ "${PV#7}" != "${PV}" ] ; then
MYSQL_COMMUNITY_FEATURES=1
else
MYSQL_COMMUNITY_FEATURES=0
@@ -126,7 +136,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d
&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
# Having different flavours at the same time is not a good idea
-for i in "mysql" "mysql-community" "mariadb" ; do
+for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
[[ "${i}" == ${PN} ]] ||
DEPEND="${DEPEND} !dev-db/${i}"
done
@@ -160,8 +170,8 @@ if [ -z "${SERVER_URI}" ]; then
http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
"
- # The community build is on the mirrors
- elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
+ # The community and cluster builds are on the mirrors
+ elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
if [[ "${PN}" == "mysql-cluster" ]] ; then
URI_DIR="MySQL-Cluster"
URI_FILE="mysql-cluster-gpl"
@@ -206,8 +216,12 @@ IUSE="big-tables debug embedded minimal
mysql_version_is_at_least "4.1" \
&& IUSE="${IUSE} latin1"
-mysql_version_is_at_least "4.1.3" \
-&& IUSE="${IUSE} cluster extraengine"
+if mysql_version_is_at_least "4.1.3" ; then
+ IUSE="${IUSE} extraengine"
+ if [[ "${PN}" != "mysql-cluster" ]] ; then
+ IUSE="${IUSE} cluster"
+ fi
+fi
mysql_version_is_at_least "5.0" \
|| IUSE="${IUSE} raid"
@@ -438,7 +452,7 @@ configure_common() {
else
myconf="${myconf} --without-debug"
mysql_version_is_at_least "4.1.3" \
- && use cluster \
+ && ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
&& myconf="${myconf} --without-ndb-debug"
fi
@@ -505,8 +519,10 @@ configure_40_41_50() {
if mysql_version_is_at_least "4.1.3" ; then
myconf="${myconf} --with-geometry"
+ if [[ "${PN}" != "mysql-cluster" ]] ; then
myconf="${myconf} $(use_with cluster ndbcluster)"
fi
+ fi
if mysql_version_is_at_least "4.1.3" && use extraengine ; then
# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
@@ -626,7 +642,7 @@ configure_51() {
done
# like configuration=max-no-ndb
- if use cluster ; then
+ if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
plugins_sta="${plugins_sta} ndbcluster partition"
plugins_dis="${plugins_dis//partition}"
myconf="${myconf} --with-ndb-binlog"
@@ -824,9 +840,12 @@ mysql_src_prepare() {
i="${S}"/storage/innodb_plugin/plug.in
[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
- # Additional checks, remove bundled zlib
+ # Additional checks, remove bundled zlib (Cluster needs this, for static
+ # memory management in zlib, leave available for Cluster)
+ if [[ "${PN}" != "mysql-cluster" ]] ; then
rm -f "${S}/zlib/"*.[ch]
sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
+ fi
rm -f "scripts/mysqlbug"
# Make charsets install in the right place
@@ -1282,6 +1301,7 @@ mysql_pkg_config() {
${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
for opt in grant-tables host-cache name-resolve networking slave-start bdb \
federated innodb ssl log-bin relay-log slow-query-log external-locking \
+ ndbcluster \
; do
optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-09-06 8:02 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-09-06 8:02 UTC (permalink / raw
To: gentoo-commits
robbat2 10/09/06 08:02:08
Modified: mysql.eclass
Log:
Bug #336075: Add warning about mysql_upgrade for some users.
Revision Changes Path
1.151 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.150&r2=1.151
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.150
retrieving revision 1.151
diff -p -w -b -B -u -u -r1.150 -r1.151
--- mysql.eclass 21 Aug 2010 19:39:52 -0000 1.150
+++ mysql.eclass 6 Sep 2010 08:02:08 -0000 1.151
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.150 2010/08/21 19:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.151 2010/09/06 08:02:08 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -1177,6 +1177,11 @@ mysql_pkg_postinst() {
elog "\"emerge --config =${CATEGORY}/${PF}\""
elog "if this is a new install."
einfo
+
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
fi
if pbxt_available && use pbxt ; then
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-10-27 7:19 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-10-27 7:19 UTC (permalink / raw
To: gentoo-commits
robbat2 10/10/27 07:19:24
Modified: mysql.eclass
Log:
Bug #335185: block omit-frame-pointer due to miscompile.
Revision Changes Path
1.153 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.152&r2=1.153
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.152
retrieving revision 1.153
diff -p -w -b -B -u -u -r1.152 -r1.153
--- mysql.eclass 6 Oct 2010 00:13:11 -0000 1.152
+++ mysql.eclass 27 Oct 2010 07:19:24 -0000 1.153
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.152 2010/10/06 00:13:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.153 2010/10/27 07:19:24 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -980,6 +980,12 @@ mysql_src_configure() {
# bug #283926, with GCC4.4, this is required to get correct behavior.
append-flags -fno-strict-aliasing
+ # bug #335185, with GCC4.5 on x86 only, omit-frame-pointer causes a
+ # mis-compile
+ use x86 && [[ "$(gcc-version)" == "4.5" ]] && \
+ append-flags -fno-omit-frame-pointer && \
+ filter-flags -fomit-frame-pointer
+
econf \
--libexecdir="/usr/sbin" \
--sysconfdir="${MY_SYSCONFDIR}" \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-10-28 20:46 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-10-28 20:46 UTC (permalink / raw
To: gentoo-commits
robbat2 10/10/28 20:46:11
Modified: mysql.eclass
Log:
Bug #336027: max-idx-128 broken by upstream presently, prevent it from corrupting user data.
Revision Changes Path
1.154 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.153&r2=1.154
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.153
retrieving revision 1.154
diff -p -w -b -B -u -u -r1.153 -r1.154
--- mysql.eclass 27 Oct 2010 07:19:24 -0000 1.153
+++ mysql.eclass 28 Oct 2010 20:46:11 -0000 1.154
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.153 2010/10/27 07:19:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.154 2010/10/28 20:46:11 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -573,7 +573,10 @@ configure_51() {
myconf="${myconf} --without-pstack"
myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin"
- use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
+ # This is an explict die here, because if we just forcibly disable it, then the
+ # user's data is not accessible.
+ use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
+ #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
myconf="${myconf} $(use_enable community community-features)"
if use community; then
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-11-02 20:27 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-11-02 20:27 UTC (permalink / raw
To: gentoo-commits
robbat2 10/11/02 20:27:41
Modified: mysql.eclass
Log:
Bug #335185, #335995 redux: If GCC >= 4.3.3, block omit-frame-pointer.
Revision Changes Path
1.155 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.154&r2=1.155
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.154
retrieving revision 1.155
diff -p -w -b -B -u -u -r1.154 -r1.155
--- mysql.eclass 28 Oct 2010 20:46:11 -0000 1.154
+++ mysql.eclass 2 Nov 2010 20:27:41 -0000 1.155
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.154 2010/10/28 20:46:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.155 2010/11/02 20:27:41 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -983,9 +983,12 @@ mysql_src_configure() {
# bug #283926, with GCC4.4, this is required to get correct behavior.
append-flags -fno-strict-aliasing
- # bug #335185, with GCC4.5 on x86 only, omit-frame-pointer causes a
- # mis-compile
- use x86 && [[ "$(gcc-version)" == "4.5" ]] && \
+ # bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
+ # causes a mis-compile.
+ # Upstream bugs:
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
+ # http://bugs.mysql.com/bug.php?id=45205
+ use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
append-flags -fno-omit-frame-pointer && \
filter-flags -fomit-frame-pointer
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2010-11-28 21:55 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-11-28 21:55 UTC (permalink / raw
To: gentoo-commits
robbat2 10/11/28 21:55:54
Modified: mysql.eclass
Log:
Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51
Revision Changes Path
1.156 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.155&r2=1.156
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.155
retrieving revision 1.156
diff -p -w -b -B -u -u -r1.155 -r1.156
--- mysql.eclass 2 Nov 2010 20:27:41 -0000 1.155
+++ mysql.eclass 28 Nov 2010 21:55:54 -0000 1.156
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.155 2010/11/02 20:27:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -756,6 +756,13 @@ mysql_pkg_setup() {
die "${M}"
fi
+ if mysql_version_is_at_least "5.1.51" \
+ && ! mysql_version_is_at_least "5.2" \
+ && use debug ; then
+ # Also in package.use.mask
+ die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
+ fi
+
if ! mysql_version_is_at_least "5.0" \
&& use raid \
&& use static ; then
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2011-03-26 23:44 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 79+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2011-03-26 23:44 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 11/03/26 23:44:43
Modified: mysql.eclass
Log:
Ported the mysql.eclass from the overlay.
Ensure sys-libs/ncurses is built with static-libs if the static use flag is enabled - fixes bug 350844.
Add support for new engines on mariadb.
Fix building of pbxt engine on mariadb - fixes bug 351067.
Fix the eclass to allow the use of MYSQL_ROOT_PASSWORD and update the instructions about the options for authentication on pkg_config - fixes bug 356885.
Revision Changes Path
1.157 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.157&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.156&r2=1.157
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- mysql.eclass 28 Nov 2010 21:55:54 -0000 1.156
+++ mysql.eclass 26 Mar 2011 23:44:43 -0000 1.157
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.157 2011/03/26 23:44:43 jmbsvicetto Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -145,6 +145,10 @@
!minimal? ( dev-db/mysql-init-scripts )
selinux? ( sec-policy/selinux-mysql )"
+if [ "${EAPI:-0}" = "2" ]; then
+ DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
+fi
+
# compile-time-only
mysql_version_is_at_least "5.1" \
|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
@@ -153,6 +157,12 @@
mysql_version_is_at_least "5.1.12" \
&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2" \
+&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
+#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
+# sphinx? ( app-misc/sphinx )"
+
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
@@ -241,6 +251,12 @@
[[ "${PN}" == "mariadb" ]] \
&& IUSE="${IUSE} libevent"
+[[ "${PN}" == "mariadb" ]] \
+&& mysql_version_is_at_least "5.2" \
+&& IUSE="${IUSE} oqgraph"
+#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
+#&& IUSE="${IUSE} oqgraph sphinx"
+
# MariaDB has integrated PBXT
# PBXT_VERSION means that we have a PBXT patch for this PV
# PBXT was only introduced after 5.1.12
@@ -622,16 +638,17 @@
if use extraengine ; then
# like configuration=max-no-ndb, archive and example removed in 5.1.11
# not added yet: ibmdb2i
- # Not supporting as examples: example,daemon_example,ftexample
+ # Not supporting as examples: example,daemon_example,ftexample
plugins_sta="${plugins_sta} partition"
- plugins_dyn="${plugins_sta} federated"
if [[ "${PN}" != "mariadb" ]] ; then
elog "Before using the Federated storage engine, please be sure to read"
elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
+ plugins_dyn="${plugins_sta} federated"
else
elog "MariaDB includes the FederatedX engine. Be sure to read"
elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
+ plugins_dyn="${plugins_sta} federatedx"
fi
else
plugins_dis="${plugins_dis} partition federated"
@@ -659,7 +676,15 @@
if [[ "${PN}" == "mariadb" ]] ; then
# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
# caught above.
- plugins_sta="${plugins_sta} maria"
+ # This is not optional, without it several upstream testcases fail.
+ # Also strongly recommended by upstream.
+ if [[ "${PV}" < "5.2.0" ]] ; then
+ myconf="${myconf} --with-maria-tmp-tables"
+ plugins_sta="${plugins_sta} maria"
+ else
+ myconf="${myconf} --with-aria-tmp-tables"
+ plugins_sta="${plugins_sta} aria"
+ fi
[ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
die "The ${P} package doesn't provide innobase nor xtradb"
@@ -669,9 +694,16 @@
done
myconf="${myconf} $(use_with libevent)"
- # This is not optional, without it several upstream testcases fail.
- # Also strongly recommended by upstream.
- myconf="${myconf} --with-maria-tmp-tables"
+
+ if mysql_version_is_at_least "5.2" ; then
+ #This should include sphinx, but the 5.2.4 archive forgot the plug.in file
+ #for i in oqgraph sphinx ; do
+ for i in oqgraph ; do
+ use ${i} \
+ && plugins_dyn="${plugins_dyn} ${i}" \
+ || plugins_dis="${plugins_dis} ${i}"
+ done
+ fi
fi
if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
@@ -749,6 +781,15 @@
fi
fi
+ # bug 350844
+ case "${EAPI:-0}" in
+ 0 | 1)
+ if use static && !built_with_use sys-libs/ncurses static-libs; then
+ die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
+ fi
+ ;;
+ esac
+
# Check for USE flag problems in pkg_setup
if use static && use ssl ; then
M="MySQL does not support being built statically with SSL support enabled!"
@@ -794,7 +835,7 @@
if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
GCC_VER=$(gcc-version)
case ${GCC_VER} in
- 2*|3*|4.0|4.1|4.2)
+ 2*|3*|4.0|4.1|4.2)
eerror "Some releases of MySQL required a very new GCC, and then"
eerror "later release relaxed that requirement again. Either pick a"
eerror "MySQL >=5.0.87, or use a newer GCC."
@@ -899,7 +940,7 @@
popd >/dev/null
fi
- if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
+ if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
einfo "Adding storage engine: PBXT"
pushd "${S}"/storage >/dev/null
i='pbxt'
@@ -1274,7 +1315,6 @@
local pwd1="a"
local pwd2="b"
- local MYSQL_ROOT_PASSWORD=''
local maxtry=15
if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then
@@ -1294,8 +1334,8 @@
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
- einfo "Please provide a password for the mysql 'root' user now,"
- einfo "or in the MYSQL_ROOT_PASSWORD env var."
+ einfo "Please provide a password for the mysql 'root' user now, in the"
+ einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
ewarn "Avoid [\"'\\_%] characters in the password"
read -rsp " >" pwd1 ; echo
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2011-03-28 22:36 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 79+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2011-03-28 22:36 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 11/03/28 22:36:13
Modified: mysql.eclass
Log:
Fix the ncurses dep as the stable versions don't have the static-libs use flag.
Revision Changes Path
1.158 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.157&r2=1.158
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- mysql.eclass 26 Mar 2011 23:44:43 -0000 1.157
+++ mysql.eclass 28 Mar 2011 22:36:13 -0000 1.158
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.157 2011/03/26 23:44:43 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.158 2011/03/28 22:36:13 jmbsvicetto Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -146,7 +146,7 @@
selinux? ( sec-policy/selinux-mysql )"
if [ "${EAPI:-0}" = "2" ]; then
- DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
+ DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
fi
# compile-time-only
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2011-04-21 12:15 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-04-21 12:15 UTC (permalink / raw
To: gentoo-commits
robbat2 11/04/21 12:15:19
Modified: mysql.eclass
Log:
Update mysql.eclass for 5.1.56 deployment. LIBDIR is for multilib.
Revision Changes Path
1.159 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.159&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.158&r2=1.159
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.158
retrieving revision 1.159
diff -p -w -b -B -u -u -r1.158 -r1.159
--- mysql.eclass 28 Mar 2011 22:36:13 -0000 1.158
+++ mysql.eclass 21 Apr 2011 12:15:19 -0000 1.159
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.158 2011/03/28 22:36:13 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.159 2011/04/21 12:15:19 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -1052,6 +1052,7 @@ mysql_src_configure() {
--enable-thread-safe-client \
--with-comment="Gentoo Linux ${PF}" \
--without-docs \
+ --with-LIBDIR="$(get_libdir)" \
${myconf} || die "econf failed"
# TODO: Move this before autoreconf !!!
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2011-05-07 19:16 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-05-07 19:16 UTC (permalink / raw
To: gentoo-commits
robbat2 11/05/07 19:16:48
Modified: mysql.eclass
Log:
Bug #366289: some of the docs are removed in newer versions, update dodoc line.
Revision Changes Path
1.160 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.159&r2=1.160
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.159
retrieving revision 1.160
diff -p -w -b -B -u -u -r1.159 -r1.160
--- mysql.eclass 21 Apr 2011 12:15:19 -0000 1.159
+++ mysql.eclass 7 May 2011 19:16:48 -0000 1.160
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.159 2011/04/21 12:15:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.160 2011/05/07 19:16:48 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -1171,7 +1171,9 @@ mysql_src_install() {
# Docs
einfo "Installing docs"
- dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+ for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
+ [[ -f "$i" ]] && dodoc "$i"
+ done
doinfo "${S}"/Docs/mysql.info
# Minimal builds don't have the MySQL server
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2012-01-08 23:33 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 79+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2012-01-08 23:33 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 12/01/08 23:33:25
Modified: mysql.eclass
Log:
[mysql.eclass] Allow use of EAPI 3 and 4.
Revision Changes Path
1.168 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.167&r2=1.168
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- mysql.eclass 6 Jan 2012 21:32:48 -0000 1.167
+++ mysql.eclass 8 Jan 2012 23:33:25 -0000 1.168
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.167 2012/01/06 21:32:48 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.168 2012/01/08 23:33:25 jmbsvicetto Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -33,7 +33,7 @@
fi
case "${EAPI:-0}" in
- 2)
+ 2 | 3 | 4)
EXPORT_FUNCTIONS pkg_setup \
src_unpack src_prepare \
src_configure src_compile \
^ permalink raw reply [flat|nested] 79+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
@ 2012-07-31 16:57 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 79+ messages in thread
From: Robin H. Johnson (robbat2) @ 2012-07-31 16:57 UTC (permalink / raw
To: gentoo-commits
robbat2 12/07/31 16:57:29
Modified: mysql.eclass
Log:
Bug #428742: missing whitespace.
Revision Changes Path
1.173 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.173&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.173&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.172&r2=1.173
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.172
retrieving revision 1.173
diff -p -w -b -B -u -u -r1.172 -r1.173
--- mysql.eclass 23 Jul 2012 10:57:15 -0000 1.172
+++ mysql.eclass 31 Jul 2012 16:57:29 -0000 1.173
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.172 2012/07/23 10:57:15 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.173 2012/07/31 16:57:29 robbat2 Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
^ permalink raw reply [flat|nested] 79+ messages in thread
end of thread, other threads:[~2012-07-31 16:57 UTC | newest]
Thread overview: 79+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-31 5:00 [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2012-07-31 16:57 Robin H. Johnson (robbat2)
2012-01-08 23:33 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2011-05-07 19:16 Robin H. Johnson (robbat2)
2011-04-21 12:15 Robin H. Johnson (robbat2)
2011-03-28 22:36 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2011-03-26 23:44 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-11-28 21:55 Robin H. Johnson (robbat2)
2010-11-02 20:27 Robin H. Johnson (robbat2)
2010-10-28 20:46 Robin H. Johnson (robbat2)
2010-10-27 7:19 Robin H. Johnson (robbat2)
2010-09-06 8:02 Robin H. Johnson (robbat2)
2010-08-20 23:52 Robin H. Johnson (robbat2)
2010-08-09 19:29 Robin H. Johnson (robbat2)
2010-08-08 23:31 Robin H. Johnson (robbat2)
2010-05-13 19:45 Robin H. Johnson (robbat2)
2010-04-27 5:45 Robin H. Johnson (robbat2)
2010-04-01 20:36 Robin H. Johnson (robbat2)
2010-03-25 20:58 Robin H. Johnson (robbat2)
2010-03-24 20:37 Robin H. Johnson (robbat2)
2010-03-24 3:45 Robin H. Johnson (robbat2)
2010-03-24 3:09 Robin H. Johnson (robbat2)
2010-03-15 19:27 Robin H. Johnson (robbat2)
2010-03-15 19:05 Robin H. Johnson (robbat2)
2010-03-15 18:50 Robin H. Johnson (robbat2)
2010-03-09 20:37 Robin H. Johnson (robbat2)
2010-03-03 23:57 Robin H. Johnson (robbat2)
2010-02-27 18:21 Robin H. Johnson (robbat2)
2010-02-21 0:18 Robin H. Johnson (robbat2)
2010-02-02 22:16 Robin H. Johnson (robbat2)
2010-02-02 3:01 Robin H. Johnson (robbat2)
2010-02-02 2:59 Robin H. Johnson (robbat2)
2010-02-02 2:46 Robin H. Johnson (robbat2)
2010-02-01 19:16 Hanno Boeck (hanno)
2010-02-01 1:07 Robin H. Johnson (robbat2)
2010-01-31 5:47 Robin H. Johnson (robbat2)
2010-01-31 3:05 Robin H. Johnson (robbat2)
2009-12-10 1:27 Robin H. Johnson (robbat2)
2009-12-09 19:17 Robin H. Johnson (robbat2)
2009-12-09 18:54 Robin H. Johnson (robbat2)
2009-12-09 18:46 Robin H. Johnson (robbat2)
2009-12-09 18:45 Robin H. Johnson (robbat2)
2009-11-19 20:59 Hanno Boeck (hanno)
2009-11-19 18:22 Robin H. Johnson (robbat2)
2009-10-11 11:42 Markus Meier (maekke)
2009-09-08 5:28 Robin H. Johnson (robbat2)
2009-07-06 19:06 Robin H. Johnson (robbat2)
2009-07-06 19:05 Robin H. Johnson (robbat2)
2009-07-06 18:58 Robin H. Johnson (robbat2)
2009-07-06 18:21 Robin H. Johnson (robbat2)
2009-07-06 18:18 Robin H. Johnson (robbat2)
2009-02-28 10:51 Robin H. Johnson (robbat2)
2009-02-28 10:50 Robin H. Johnson (robbat2)
2009-02-28 10:49 Robin H. Johnson (robbat2)
2009-02-11 11:29 Robin H. Johnson (robbat2)
2009-02-11 11:28 Robin H. Johnson (robbat2)
2009-02-11 11:27 Robin H. Johnson (robbat2)
2009-01-12 23:08 Markus Meier (maekke)
2008-11-29 2:30 Robin H. Johnson (robbat2)
2008-11-20 20:44 Robin H. Johnson (robbat2)
2008-11-14 22:07 Robin H. Johnson (robbat2)
2008-11-14 4:48 Robin H. Johnson (robbat2)
2008-11-14 1:46 Robin H. Johnson (robbat2)
2008-10-16 18:48 Petteri Raty (betelgeuse)
2008-05-29 19:35 Robin H. Johnson (robbat2)
2008-05-29 5:38 Robin H. Johnson (robbat2)
2008-05-29 5:33 Robin H. Johnson (robbat2)
2008-05-29 5:28 Robin H. Johnson (robbat2)
2008-05-29 5:17 Robin H. Johnson (robbat2)
2008-05-29 3:15 Robin H. Johnson (robbat2)
2008-05-22 18:13 Robin H. Johnson (robbat2)
2008-04-05 0:43 Robin H. Johnson (robbat2)
2008-03-10 2:47 Robin H. Johnson (robbat2)
2008-03-09 21:19 Robin H. Johnson (robbat2)
2008-03-09 21:13 Robin H. Johnson (robbat2)
2008-03-09 21:09 Robin H. Johnson (robbat2)
2008-01-16 4:01 Robin H. Johnson (robbat2)
2007-11-08 9:42 Robin H. Johnson (robbat2)
2007-10-02 10:00 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox