summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-01-18 20:20:30 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-01-18 20:20:30 +0000
commit9ecd05d801b59ed5d6812454274b33c5b305964b (patch)
treefa59e8bfeac0933d1a5889e1f3dc56acfc4a1a1e /dev-php5
parentStable on ppc64; bug #119445 (diff)
downloadhistorical-9ecd05d801b59ed5d6812454274b33c5b305964b.tar.gz
historical-9ecd05d801b59ed5d6812454274b33c5b305964b.tar.bz2
historical-9ecd05d801b59ed5d6812454274b33c5b305964b.zip
Fix bug #116914.
Package-Manager: portage-2.0.54
Diffstat (limited to 'dev-php5')
-rw-r--r--dev-php5/pecl-pdo-pgsql/ChangeLog6
-rw-r--r--dev-php5/pecl-pdo-pgsql/files/fix-tsrm.patch11
-rw-r--r--dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild11
3 files changed, 26 insertions, 2 deletions
diff --git a/dev-php5/pecl-pdo-pgsql/ChangeLog b/dev-php5/pecl-pdo-pgsql/ChangeLog
index 05a740e02641..e37dd111fc88 100644
--- a/dev-php5/pecl-pdo-pgsql/ChangeLog
+++ b/dev-php5/pecl-pdo-pgsql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php5/pecl-pdo-pgsql
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/ChangeLog,v 1.6 2006/01/01 08:08:45 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/ChangeLog,v 1.7 2006/01/18 20:20:30 chtekk Exp $
+
+ 18 Jan 2006; Luca Longinotti <chtekk@gentoo.org> +files/fix-tsrm.patch,
+ pecl-pdo-pgsql-1.0.1.ebuild:
+ Fix bug #116914.
01 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
pecl-pdo-pgsql-1.0.1.ebuild:
diff --git a/dev-php5/pecl-pdo-pgsql/files/fix-tsrm.patch b/dev-php5/pecl-pdo-pgsql/files/fix-tsrm.patch
new file mode 100644
index 000000000000..db78cb0c4613
--- /dev/null
+++ b/dev-php5/pecl-pdo-pgsql/files/fix-tsrm.patch
@@ -0,0 +1,11 @@
+--- pgsql_driver.c 2006-01-18 20:54:18.000000000 +0100
++++ pgsql_driver.c 2006-01-18 20:55:15.000000000 +0100
+@@ -132,7 +132,7 @@
+ lo_close(self->conn, self->lfd);
+ }
+ efree(self);
+- php_pdo_dbh_delref(dbh TSRMLS_DC);
++ php_pdo_dbh_delref(dbh TSRMLS_CC);
+ return 0;
+ }
+
diff --git a/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild b/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild
index 4b87ecacb429..2e50403ffd71 100644
--- a/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild
+++ b/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild,v 1.2 2006/01/01 08:08:45 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild,v 1.3 2006/01/18 20:20:30 chtekk Exp $
PHP_EXT_NAME="pdo_pgsql"
PHP_EXT_PECL_PKG="PDO_PGSQL"
@@ -35,6 +35,15 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+
+ cd "${S}"
+
+ # fix Gentoo bug #116914
+ epatch "${FILESDIR}/fix-tsrm.patch"
+}
+
src_compile() {
has_php
my_conf="--with-pdo-pgsql"