com php-src: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file: Makefile.global NEWS acinclude.m4

Commit: e3a4b87e899ac55995f783e52379801973e199e7 Author: Christopher Jones <sixd@php.net> Wed, 31 Jul 2013 09:58:28 -0700 Parents: 0625d5ce67bcaf4a82b0f95dc6968ca5473c8171 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e3a4b87e899ac55995f783e52379801973e199e7 Log: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file Bugs: https://bugs.php.net/62691 Changed paths: M Makefile.global M NEWS M acinclude.m4 Diff: diff --git a/Makefile.global b/Makefile.global index 5118de8..b714a65 100644 --- a/Makefile.global +++ b/Makefile.global @@ -118,7 +118,7 @@ clean: rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f .PHONY: all clean install distclean test diff --git a/NEWS b/NEWS index 78f6539..6fe5c3a 100644 --- a/NEWS +++ b/NEWS @@ -9,8 +9,9 @@ PHP NEWS . Fixed bug #65304 (Use of max int in array_sum). (Laruence) . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very limited case). (Arpad) + . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones) -- OPcahce: +- OPcache: . Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s).. (Dmitry) . Added support for glob symbols in blacklist entries (?, *, **). diff --git a/acinclude.m4 b/acinclude.m4 index 6c97dc3..07b1f8e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2965,7 +2965,7 @@ dnl Generate Makefile.objects entries cat>>Makefile.objects<<EOF $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc - CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@ + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && cp \$[]@ \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj