diff options
| author |   Francesco Riosa <vivo@gentoo.org> | 2005-12-12 10:49:59 +0000 |
|---|---|---|
| committer | Francesco Riosa <vivo@gentoo.org> | 2005-12-12 10:49:59 +0000 |
| commit | da8aa510d4e24ef3a262b21111e3c962a1ee8472 (patch) | |
| tree | 66f1d4ec92fe65f23a13b28b95a9395c5846122b /dev-perl | |
| parent | 4.3.14 and 4.4.1 stable on x86. (diff) | |
| download | gentoo-2-da8aa510d4e24ef3a262b21111e3c962a1ee8472.tar.gz gentoo-2-da8aa510d4e24ef3a262b21111e3c962a1ee8472.tar.bz2 gentoo-2-da8aa510d4e24ef3a262b21111e3c962a1ee8472.zip | |
Bug #114925, thanks to "malc"
(Portage version: 2.0.53)
Diffstat (limited to 'dev-perl')
| -rw-r--r-- | dev-perl/DBD-mysql/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild | 10 | ||||
| -rw-r--r-- | dev-perl/DBD-mysql/files/mysql-5.0-new_bit_type.patch | 41 |
3 files changed, 55 insertions, 3 deletions
diff --git a/dev-perl/DBD-mysql/ChangeLog b/dev-perl/DBD-mysql/ChangeLog index 3ff102afe190..490af5a1b5a1 100644 --- a/dev-perl/DBD-mysql/ChangeLog +++ b/dev-perl/DBD-mysql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-perl/DBD-mysql # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/ChangeLog,v 1.44 2005/12/08 21:18:11 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/ChangeLog,v 1.45 2005/12/12 10:49:59 vivo Exp $ + + 12 Dec 2005; Francesco Riosa <vivo@gentoo.org> + +files/mysql-5.0-new_bit_type.patch, DBD-mysql-3.0002_p4.ebuild: + fix Bug #114925, compile fail with mysql < 5.0. Many thanks Malcolm (malc) + Lashley. *DBD-mysql-3.0002_p4 (08 Dec 2005) diff --git a/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild b/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild index f9f083ae55fb..81b5b49bfa0c 100644 --- a/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild +++ b/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild,v 1.1 2005/12/08 21:18:11 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild,v 1.2 2005/12/12 10:49:59 vivo Exp $ -inherit perl-module +inherit eutils perl-module MY_P="${P/_p/_}" S=${WORKDIR}/${MY_P} @@ -21,3 +21,9 @@ DEPEND="dev-perl/DBI dev-db/mysql" mydoc="ToDo" + +src_unpack () { + unpack ${A} + cd ${S} + epatch "${FILESDIR}/mysql-5.0-new_bit_type.patch" +} diff --git a/dev-perl/DBD-mysql/files/mysql-5.0-new_bit_type.patch b/dev-perl/DBD-mysql/files/mysql-5.0-new_bit_type.patch new file mode 100644 index 000000000000..426e67872e7f --- /dev/null +++ b/dev-perl/DBD-mysql/files/mysql-5.0-new_bit_type.patch @@ -0,0 +1,41 @@ +diff -aur DBD-mysql-3.0002_4/dbdimp.c DBD-mysql-3.0002_4/dbdimp.c +--- DBD-mysql-3.0002_4/dbdimp.c 2005-11-06 21:32:01.000000000 +0000 ++++ DBD-mysql-3.0002_4/dbdimp.c 2005-12-11 11:46:08.000000000 +0000 +@@ -246,9 +246,10 @@ + case MYSQL_TYPE_LONG: + case MYSQL_TYPE_INT24: + case MYSQL_TYPE_YEAR: ++#if MYSQL_VERSION_ID > NEW_BIT_DATATYPE_VERSION + case MYSQL_TYPE_BIT: + return MYSQL_TYPE_LONG; +- ++#endif + case MYSQL_TYPE_DECIMAL: + case MYSQL_TYPE_LONGLONG: /* No longlong in perl */ + case MYSQL_TYPE_DATE: +@@ -256,11 +257,13 @@ + case MYSQL_TYPE_DATETIME: + case MYSQL_TYPE_NEWDATE: + case MYSQL_TYPE_VAR_STRING: ++#if MYSQL_VERSION_ID > NEW_BIT_DATATYPE_VERSION + case MYSQL_TYPE_VARCHAR: ++#endif + case MYSQL_TYPE_STRING: + case MYSQL_TYPE_BLOB: + case MYSQL_TYPE_TINY_BLOB: +-#ifdef MYSQL_VERSION_ID > NEW_DATATYPE_VERSION ++#if MYSQL_VERSION_ID > NEW_DATATYPE_VERSION + case MYSQL_TYPE_GEOMETRY: + #endif + case MYSQL_TYPE_TIMESTAMP: +diff -aur DBD-mysql-3.0002_4/dbdimp.h DBD-mysql-3.0002_4/dbdimp.h +--- DBD-mysql-3.0002_4/dbdimp.h 2005-11-06 21:32:01.000000000 +0000 ++++ DBD-mysql-3.0002_4/dbdimp.h 2005-12-11 11:32:00.000000000 +0000 +@@ -31,6 +31,7 @@ + #define SERVER_PREPARE_VERSION 40103 + #define LIMIT_PLACEHOLDER_VERSION 50007 + #define NEW_DATATYPE_VERSION 50007 ++#define NEW_BIT_DATATYPE_VERSION 50300 + + /* + * The following are return codes passed in $h->err in case of |