Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed bug #62691 (solaris sed has no -i switch)

Make 'make distclean' remove generated DTrace .h file
  • Loading branch information...
commit e3a4b87e899ac55995f783e52379801973e199e7 1 parent 0625d5c
Christopher Jones authored

Showing 3 changed files with 4 additions and 3 deletions. Show diff stats Hide diff stats

  1. +1 1  Makefile.global
  2. +2 1  NEWS
  3. +1 1  acinclude.m4
2  Makefile.global
@@ -118,7 +118,7 @@ clean:
118 118 rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
119 119
120 120 distclean: clean
121   - 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
  121 + 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
122 122 $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
123 123
124 124 .PHONY: all clean install distclean test
3  NEWS
@@ -9,8 +9,9 @@ PHP NEWS
9 9 . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
10 10 . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
11 11 limited case). (Arpad)
  12 + . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
12 13
13   -- OPcahce:
  14 +- OPcache:
14 15 . Added opcache.restrict_api configuration directive that may limit
15 16 usage of OPcahce API functions only to patricular script(s). (Dmitry)
16 17 . Added support for glob symbols in blacklist entries (?, *, **).
2  acinclude.m4
@@ -2965,7 +2965,7 @@ dnl Generate Makefile.objects entries
2965 2965 cat>>Makefile.objects<<EOF
2966 2966
2967 2967 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
2968   - CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
  2968 + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && cp \$[]@ \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
2969 2969
2970 2970 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
2971 2971

0 comments on commit e3a4b87

Please sign in to comment.
Something went wrong with that request. Please try again.