diff options
| author | pav <pav@FreeBSD.org> | 2006-11-23 08:29:10 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2006-11-23 08:29:10 +0800 |
| commit | bc239a5fcf63f9b2d1598ac66b98cd43d70709be (patch) | |
| tree | cd598a02359307b96bb4769556fa7a3d64907cc3 /devel/pecl-runkit | |
| parent | 72f0fd20198223b7ac949b210a22a6bfed74c270 (diff) | |
| download | freebsd-ports-gnome-bc239a5fcf63f9b2d1598ac66b98cd43d70709be.tar.gz freebsd-ports-gnome-bc239a5fcf63f9b2d1598ac66b98cd43d70709be.tar.zst freebsd-ports-gnome-bc239a5fcf63f9b2d1598ac66b98cd43d70709be.zip | |
- Unbreak: fix build with PHP 5.2.0
Obtained from: vendor CVS
Diffstat (limited to 'devel/pecl-runkit')
| -rw-r--r-- | devel/pecl-runkit/Makefile | 2 | ||||
| -rw-r--r-- | devel/pecl-runkit/files/patch-php520fix | 29 |
2 files changed, 29 insertions, 2 deletions
diff --git a/devel/pecl-runkit/Makefile b/devel/pecl-runkit/Makefile index dc8855c63c8c..f36a7012b780 100644 --- a/devel/pecl-runkit/Makefile +++ b/devel/pecl-runkit/Makefile @@ -17,8 +17,6 @@ DIST_SUBDIR= PECL MAINTAINER= pav@FreeBSD.org COMMENT= PECL extension to modify constants, user-defined functions and classes -BROKEN= Does not compile - USE_PHP= yes USE_PHPEXT= yes PHP_MODNAME= runkit diff --git a/devel/pecl-runkit/files/patch-php520fix b/devel/pecl-runkit/files/patch-php520fix new file mode 100644 index 000000000000..6b690e74fe14 --- /dev/null +++ b/devel/pecl-runkit/files/patch-php520fix @@ -0,0 +1,29 @@ +--- php_runkit.h 2006/06/07 17:35:33 1.29 ++++ php_runkit.h 2006/10/26 16:18:52 1.30 +@@ -40,6 +40,13 @@ + #define PHP_RUNKIT_IMPORT_CLASS_PROPS 0x0008 + #define PHP_RUNKIT_IMPORT_CLASSES (PHP_RUNKIT_IMPORT_CLASS_METHODS|PHP_RUNKIT_IMPORT_CLASS_CONSTS|PHP_RUNKIT_IMPORT_CLASS_PROPS) + #define PHP_RUNKIT_IMPORT_OVERRIDE 0x0010 ++ ++#if ZEND_MODULE_API_NO > 20050922 ++#define ZEND_ENGINE_2_2 ++#endif ++#if ZEND_MODULE_API_NO > 20050921 ++#define ZEND_ENGINE_2_1 ++#endif + + /* The TSRM interpreter patch required by runkit_sandbox was added in 5.1, but this package includes diffs for older versions + * Those diffs include an additional #define to indicate that they've been applied +--- runkit_import.c 2006/06/07 17:35:33 1.9 ++++ runkit_import.c 2006/10/26 16:18:52 1.10 +@@ -228,7 +228,9 @@ + if (zend_hash_get_current_key_ex(&ce->default_properties, &key, &key_len, &idx, 0, &pos) == HASH_KEY_IS_STRING) { + char *cname = NULL, *pname = key; + +-#ifdef ZEND_ENGINE_2 ++#ifdef ZEND_ENGINE_2_2 ++ zend_unmangle_property_name(key, key_len - 1, &cname, &pname); ++#elif defined(ZEND_ENGINE_2) + zend_unmangle_property_name(key, &cname, &pname); + #endif + if (zend_hash_exists(&dce->default_properties, key, key_len)) { |