NEWS for recent DTrace merges.

Remove redundant 'cp' during DTrace install.

diff --git a/NEWS b/NEWS
index 332d4e79f77ab71e2f331700d276afa44cdcbfa5..103abeb092fb9e26a337d00c0076712d0bc0c896 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 76845d6f738339da1d1970e20dcef4610e3d650c..f7da55ce585fdf1ac4019007196395ea92a1ba75 100644 (file)
--- 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