diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2007-03-05 01:40:55 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2007-03-05 01:40:55 +0000 |
| commit | 1739d607a121d3ffdfe4a6704eecff5cabe07eb2 (patch) | |
| tree | 93ef7fa88c0760f26aaffc1995bb4eb4d6b39f02 /dev-php5 | |
| parent | Stable for HPPA. (diff) | |
| download | gentoo-2-1739d607a121d3ffdfe4a6704eecff5cabe07eb2.tar.gz gentoo-2-1739d607a121d3ffdfe4a6704eecff5cabe07eb2.tar.bz2 gentoo-2-1739d607a121d3ffdfe4a6704eecff5cabe07eb2.zip | |
Fix compile on 5.2.
(Portage version: 2.1.2.1)
Diffstat (limited to 'dev-php5')
| -rw-r--r-- | dev-php5/pecl-pdo/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-php5/pecl-pdo/files/pecl-pdo-1.0.3-verscheck.patch | 11 | ||||
| -rw-r--r-- | dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild | 8 |
3 files changed, 23 insertions, 2 deletions
diff --git a/dev-php5/pecl-pdo/ChangeLog b/dev-php5/pecl-pdo/ChangeLog index ba066978c4f0..5fc43bcb4239 100644 --- a/dev-php5/pecl-pdo/ChangeLog +++ b/dev-php5/pecl-pdo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php5/pecl-pdo # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.19 2007/03/04 21:04:43 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.20 2007/03/05 01:40:55 chtekk Exp $ + + 05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> + +files/pecl-pdo-1.0.3-verscheck.patch, pecl-pdo-1.0.3.ebuild: + Fix emerge on PHP 5.2. 04 Mar 2007; Luca Longinotti <chtekk@gentoo.org> -pecl-pdo-1.0.2.ebuild, pecl-pdo-1.0.3.ebuild: diff --git a/dev-php5/pecl-pdo/files/pecl-pdo-1.0.3-verscheck.patch b/dev-php5/pecl-pdo/files/pecl-pdo-1.0.3-verscheck.patch new file mode 100644 index 000000000000..405fc63440e1 --- /dev/null +++ b/dev-php5/pecl-pdo/files/pecl-pdo-1.0.3-verscheck.patch @@ -0,0 +1,11 @@ +--- pdo.c 2006/01/01 12:50:11 1.57.2.17 ++++ pdo.c 2006/05/09 23:54:48 1.57.2.17.2.1 +@@ -74,7 +74,7 @@ + } + } + #endif +-#if (PHP_MAJOR_VERSION < 6) ++#if (PHP_MAJOR_VERSION <= 5) && (PHP_MINOR_VERSION < 2) + return zend_exception_get_default(); + #else + return zend_exception_get_default(TSRMLS_C); diff --git a/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild b/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild index 5b41f7eba0c3..4b64e7d01337 100644 --- a/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild +++ b/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild @@ -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/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild,v 1.3 2007/03/04 21:04:43 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild,v 1.4 2007/03/05 01:40:55 chtekk Exp $ PHP_EXT_NAME="pdo" PHP_EXT_PECL_PKG="PDO" @@ -40,6 +40,12 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-verscheck.patch" +} + src_install() { php-ext-pecl-r1_src_install |