Skip to content

Commit 47d66a0

Browse files
committedAug 5, 2013
NEWS for recent DTrace merges.
Remove redundant 'cp' during DTrace install.
1 parent 3bbe593 commit 47d66a0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed
 

‎NEWS

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ PHP NEWS
99
. Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
1010
limited case). (Arpad)
1111
. Improve fix for bug #63186 (compile failure on netbsd). (Matteo)
12+
. Fixed bug #61268 (--enable-dtrace leads make to clobber
13+
Zend/zend_dtrace.d) (Chris Jones)
14+
. Cherry picked some DTrace build commits (allowing builds on Linux,
15+
bug 62691, and bug 63706) from PHP 5.5 branch
1216

1317
- Session:
1418
. Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at

‎acinclude.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -2969,7 +2969,7 @@ dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
29692969
$abs_srcdir/$ac_provsrc:;
29702970
29712971
$ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
2972-
CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && cp \$[]@ \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
2972+
CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
29732973
29742974
\$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
29752975

0 commit comments

Comments
 (0)