diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-16 16:16:51 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-16 16:16:51 +0000 |
commit | bdcadb8c440f16e132d34addfa83fb4d956cb48d (patch) | |
tree | e4de7a04d2dcbcd1939e768f961058a51a267674 | |
parent | b5c309df524d42dd43b4a7ee90905c52e923ec1c (diff) |
merge revision(s) r44514: [Backport #9374]
* ext/json/generator/depend: add build dependencies for json extension
[Bug #9374] [ruby-core:59609]
* ext/json/parser/depend: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/json/generator/depend | 1 | ||||
-rw-r--r-- | ext/json/parser/depend | 1 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Feb 17 01:16:00 2014 Eric Wong <e@80x24.org> + + * ext/json/generator/depend: add build dependencies for json extension + [Bug #9374] [ruby-core:59609] + * ext/json/parser/depend: ditto + Mon Feb 17 01:12:57 2014 Yusuke Endoh <mame@tsg.ne.jp> * ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value. diff --git a/ext/json/generator/depend b/ext/json/generator/depend index 1a042a2501..593a8fbb54 100644 --- a/ext/json/generator/depend +++ b/ext/json/generator/depend @@ -1 +1,2 @@ +$(OBJS): $(ruby_headers) generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h diff --git a/ext/json/parser/depend b/ext/json/parser/depend index 498ffa964c..d188844670 100644 --- a/ext/json/parser/depend +++ b/ext/json/parser/depend @@ -1 +1,2 @@ +$(OBJS): $(ruby_headers) parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-17" -#define RUBY_PATCHLEVEL 427 +#define RUBY_PATCHLEVEL 428 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 |