diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-05 15:38:36 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-05 15:38:36 -0700 |
| commit | 47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c (patch) | |
| tree | fcc4d58b4c37c755cf5028bebbcb62ef2f5656ae | |
| parent | 3bbe5931bc2b05ff8bcdf217bc6e79f5ac4cd692 (diff) | |
| download | php-git-47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c.tar.gz | |
NEWS for recent DTrace merges.
Remove redundant 'cp' during DTrace install.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | acinclude.m4 | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -9,6 +9,10 @@ PHP NEWS . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very limited case). (Arpad) . Improve fix for bug #63186 (compile failure on netbsd). (Matteo) + . Fixed bug #61268 (--enable-dtrace leads make to clobber + Zend/zend_dtrace.d) (Chris Jones) + . Cherry picked some DTrace build commits (allowing builds on Linux, + bug 62691, and bug 63706) from PHP 5.5 branch - Session: . Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at diff --git a/acinclude.m4 b/acinclude.m4 index 76845d6f73..f7da55ce58 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2969,7 +2969,7 @@ dnl in GNU Make which causes the .d file to be overwritten (Bug 61268) $abs_srcdir/$ac_provsrc:; $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc - CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && cp \$[]@ \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj |