diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-22 08:12:34 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-22 08:12:34 +0000 |
commit | 23cf2750d15f6a859d13d7110e5994b3575c6604 (patch) | |
tree | 9933dce64199176bc847d67542b5b4c5c52aba00 /version.h | |
parent | 6d0b1d8a8691460189caee88bfbef2dd129b48bd (diff) |
merge revision(s) 49411,49419,49451,49485,49489:
configure.in: check dtace -G
* configure.in (RUBY_DTRACE_POSTPROCESS): check if the object file
is really modified by `dtrace -G`, this command is very system
dependent.
* common.mk (ruby-glommed.o): dependency on $(OBJ) should be written
in common.mk (in which OBJ is defined) because of Makefile include
and parse order. This partly reverts r49419.
[ruby-dev:48849] [Bug #10808]
* Makefile.in (ruby-glommed.o): ditto.
* Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because
it is included in $(OBJS) since r49451.
* Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS)
* Makefile.in (probes.stamp): rebuild dtrace dependent objects
only when `dtrace -G` modifies its input files.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-02-22" -#define RUBY_PATCHLEVEL 75 +#define RUBY_PATCHLEVEL 76 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 |