summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2007-03-08 23:18:40 +0000
committerLuca Longinotti <chtekk@gentoo.org>2007-03-08 23:18:40 +0000
commitc68c2b216fb89e77189636af5a91fba9cd8c2749 (patch)
treea157b2e2b6fb1c85adb04395c52b2d8a651ee272 /dev-php4/pecl-apc
parentKeyworded ~sparc (diff)
downloadgentoo-2-c68c2b216fb89e77189636af5a91fba9cd8c2749.tar.gz
gentoo-2-c68c2b216fb89e77189636af5a91fba9cd8c2749.tar.bz2
gentoo-2-c68c2b216fb89e77189636af5a91fba9cd8c2749.zip
Fix compilation on threaded PHP4.
(Portage version: 2.1.2.2)
Diffstat (limited to 'dev-php4/pecl-apc')
-rw-r--r--dev-php4/pecl-apc/ChangeLog6
-rw-r--r--dev-php4/pecl-apc/files/pecl-apc-3.0.13-tsrm.patch14
-rw-r--r--dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild8
3 files changed, 26 insertions, 2 deletions
diff --git a/dev-php4/pecl-apc/ChangeLog b/dev-php4/pecl-apc/ChangeLog
index 6be1893d9dc5..978bfedd25e7 100644
--- a/dev-php4/pecl-apc/ChangeLog
+++ b/dev-php4/pecl-apc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php4/pecl-apc
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-apc/ChangeLog,v 1.21 2007/03/06 17:19:46 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-apc/ChangeLog,v 1.22 2007/03/08 23:18:40 chtekk Exp $
+
+ 08 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+ +files/pecl-apc-3.0.13-tsrm.patch, pecl-apc-3.0.13.ebuild:
+ Fix compile on threaded PHP4.
*pecl-apc-3.0.13 (06 Mar 2007)
diff --git a/dev-php4/pecl-apc/files/pecl-apc-3.0.13-tsrm.patch b/dev-php4/pecl-apc/files/pecl-apc-3.0.13-tsrm.patch
new file mode 100644
index 000000000000..11c3639b7221
--- /dev/null
+++ b/dev-php4/pecl-apc/files/pecl-apc-3.0.13-tsrm.patch
@@ -0,0 +1,14 @@
+--- php_apc.c 2007/02/28 01:15:18 3.137
++++ php_apc.c 2007/03/08 22:35:45 3.138
+@@ -877,7 +877,11 @@
+
+ /* Free up everything */
+ zend_destroy_file_handle(&file_handle TSRMLS_CC);
++#ifdef ZEND_ENGINE_2
+ destroy_op_array(op_array TSRMLS_CC);
++#else
++ destroy_op_array(op_array);
++#endif
+ efree(op_array);
+
+ RETURN_TRUE;
diff --git a/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild b/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild
index 64263aae13b3..ac0686292226 100644
--- a/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild
+++ b/dev-php4/pecl-apc/pecl-apc-3.0.13.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-php4/pecl-apc/pecl-apc-3.0.13.ebuild,v 1.1 2007/03/06 17:19:46 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild,v 1.2 2007/03/08 23:18:40 chtekk Exp $
PHP_EXT_NAME="apc"
PHP_EXT_PECL_PKG="APC"
@@ -26,6 +26,12 @@ pkg_setup() {
require_php_sapi_from cgi apache apache2
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-tsrm.patch"
+}
+
src_compile() {
has_php