| 1 |
robbat2 08/03/09 21:13:22 |
| 2 |
|
| 3 |
Modified: mysql.eclass |
| 4 |
Log: |
| 5 |
Forcibly redo the patches every unpack, and also add support for grabbing them straight from the Git overlay, to speed up testing. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.86 eclass/mysql.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.86&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.86&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.85&r2=1.86 |
| 13 |
|
| 14 |
Index: mysql.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v |
| 17 |
retrieving revision 1.85 |
| 18 |
retrieving revision 1.86 |
| 19 |
diff -p -w -b -B -u -u -r1.85 -r1.86 |
| 20 |
--- mysql.eclass 9 Mar 2008 21:09:23 -0000 1.85 |
| 21 |
+++ mysql.eclass 9 Mar 2008 21:13:22 -0000 1.86 |
| 22 |
@@ -1,12 +1,11 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.85 2008/03/09 21:09:23 robbat2 Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.86 2008/03/09 21:13:22 robbat2 Exp $ |
| 27 |
|
| 28 |
# Author: Francesco Riosa (Retired) <vivo@g.o> |
| 29 |
-# Maintainer: Luca Longinotti <chtekk@g.o> |
| 30 |
- |
| 31 |
-# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too! |
| 32 |
-# Note that MYSQL_VERSION_ID must be empty! |
| 33 |
+# Maintainer: MySQL Team <mysql-bugs@g.o> |
| 34 |
+# - Luca Longinotti <chtekk@g.o> |
| 35 |
+# - Robin H. Johnson <robbat2@g.o> |
| 36 |
|
| 37 |
WANT_AUTOCONF="latest" |
| 38 |
WANT_AUTOMAKE="latest" |
| 39 |
@@ -18,6 +17,10 @@ inherit eutils flag-o-matic gnuconfig au |
| 40 |
S="${WORKDIR}/mysql" |
| 41 |
|
| 42 |
[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108" |
| 43 |
+if [[ "${MY_EXTRAS_VER}" == "live" ]]; then |
| 44 |
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
| 45 |
+ inherit git |
| 46 |
+fi |
| 47 |
|
| 48 |
if [[ ${PR#r} -lt 60 ]] ; then |
| 49 |
IS_BITKEEPER=0 |
| 50 |
@@ -81,7 +84,9 @@ if [ -z "${SERVER_URI}" ]; then |
| 51 |
fi |
| 52 |
|
| 53 |
# Define correct SRC_URIs |
| 54 |
-SRC_URI="${SERVER_URI} |
| 55 |
+SRC_URI="${SERVER_URI}" |
| 56 |
+ |
| 57 |
+[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI} |
| 58 |
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 |
| 59 |
http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" |
| 60 |
mysql_version_is_at_least "5.1.12" \ |
| 61 |
@@ -497,6 +502,9 @@ mysql_src_unpack() { |
| 62 |
mysql_init_vars |
| 63 |
|
| 64 |
unpack ${A} |
| 65 |
+ # Grab the patches |
| 66 |
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack |
| 67 |
+ # Bitkeeper checkout support |
| 68 |
if [[ ${IS_BITKEEPER} -eq 90 ]] ; then |
| 69 |
if mysql_check_version_range "5.1 to 5.1.99" ; then |
| 70 |
bitkeeper_fetch "mysql-5.1-ndb" |
| 71 |
@@ -516,7 +524,11 @@ mysql_src_unpack() { |
| 72 |
# Apply the patches for this MySQL version |
| 73 |
EPATCH_SUFFIX="patch" |
| 74 |
mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" |
| 75 |
+ # Clean out old items |
| 76 |
+ rm -f "${EPATCH_SOURCE}"/* |
| 77 |
+ # Now link in right patches |
| 78 |
mysql_mv_patches |
| 79 |
+ # And apply |
| 80 |
epatch |
| 81 |
|
| 82 |
# Additional checks, remove bundled zlib |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
-- |
| 87 |
gentoo-commits@l.g.o mailing list |
Archives