diff options
| author | glarkin <glarkin@FreeBSD.org> | 2010-04-13 21:47:23 +0800 |
|---|---|---|
| committer | glarkin <glarkin@FreeBSD.org> | 2010-04-13 21:47:23 +0800 |
| commit | d7ca7e6d62823bb00a38e6e89f7298a7d45f4d4c (patch) | |
| tree | e9e5fa0349d6a8a3255aae1e62caf8506b713fa0 | |
| parent | 93ce6f1472c6688837aecdce92d5c6d4e622c838 (diff) | |
| download | freebsd-ports-gnome-d7ca7e6d62823bb00a38e6e89f7298a7d45f4d4c.tar.gz freebsd-ports-gnome-d7ca7e6d62823bb00a38e6e89f7298a7d45f4d4c.tar.zst freebsd-ports-gnome-d7ca7e6d62823bb00a38e6e89f7298a7d45f4d4c.zip | |
- Added patch files to fix some of the common compiler errors after the
PHP 5.3.2 upgrade, but still had to mark as BROKEN because of other
less-obvious compiler errors.
Will revisit after the other PHP modules are fixed.
Reported by: pointyhat
Approved by: portmgr (itetcu, erwin - blanket)
| -rw-r--r-- | devel/php-dbg2/Makefile | 2 | ||||
| -rw-r--r-- | devel/php-dbg2/files/patch-dbg.c | 20 | ||||
| -rw-r--r-- | devel/php-dbg2/files/patch-dbg_cmd.c | 20 |
3 files changed, 42 insertions, 0 deletions
diff --git a/devel/php-dbg2/Makefile b/devel/php-dbg2/Makefile index 7fe467d4e7fa..b396adc85d1a 100644 --- a/devel/php-dbg2/Makefile +++ b/devel/php-dbg2/Makefile @@ -23,6 +23,8 @@ CONFIGURE_ARGS= --enable-dbg=shared --with-dbg-profiler \ --prefix=${PREFIX}/lib/php/${PHP_EXT_DIR} PKGMESSAGE= pkg-message +BROKEN= does not compile with PHP 5.3.2 + post-install: @${CAT} ${PKGMESSAGE} diff --git a/devel/php-dbg2/files/patch-dbg.c b/devel/php-dbg2/files/patch-dbg.c new file mode 100644 index 000000000000..628ca6e75826 --- /dev/null +++ b/devel/php-dbg2/files/patch-dbg.c @@ -0,0 +1,20 @@ +--- ./dbg.c.orig 2010-04-13 09:40:15.000000000 -0400 ++++ ./dbg.c 2010-04-13 09:41:12.000000000 -0400 +@@ -563,7 +563,7 @@ + } + DBG(is_extension_activated) = 1; + if (DBG(cfgprm_enabled)) { +- CG(extended_info) = 1; ++ CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO; + } + } + +@@ -571,7 +571,7 @@ + TSRMLS_FETCH1(C); + + DBG_TRACE(("dbg_deactivate Zend extension\n")); +- CG(extended_info) = 0; ++ CG(compiler_options) = 0; + + /* TS_ALLOC_DTOR_CALL(DBG); */ + } diff --git a/devel/php-dbg2/files/patch-dbg_cmd.c b/devel/php-dbg2/files/patch-dbg_cmd.c new file mode 100644 index 000000000000..20571784315b --- /dev/null +++ b/devel/php-dbg2/files/patch-dbg_cmd.c @@ -0,0 +1,20 @@ +--- ./dbg_cmd.c.orig 2010-04-13 09:41:26.000000000 -0400 ++++ ./dbg_cmd.c 2010-04-13 09:41:53.000000000 -0400 +@@ -601,7 +601,7 @@ + + memset(&data, 0, sizeof(data)); + Z_TYPE_P(&data) = IS_STRING; +- data.refcount++; ++ Z_ADDREF(data); + + if (DBG(eval_error)) { + efree(DBG(eval_error)); +@@ -627,7 +627,7 @@ + + memset(&buf, 0, sizeof(buf)); + Z_TYPE_P(&buf) = IS_STRING; +- buf.refcount++; ++ Z_ADDREF(buf); + + if (req->istr!=0 && (!dbg_packet_findstring(inpack, req->istr, &str, &sz) || sz<=0)) return 0; + if (str && strlen(str)==0) str = NULL; |