Skip to content

Commit ca0497b

Browse files
committedAug 5, 2013
Merge branch 'PHP-5.5'
* PHP-5.5: NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install. Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file Enable dtrace probes on linux as they are compatible with systemtap Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2 parents 8fdf1ad + 18f1781 commit ca0497b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎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)
Please sign in to comment.