merge revision(s) 44514: [Backport ruby#9374]

nurse · nurse · commit 42ffa2e13c16 · 2014-02-22T07:53:33.000Z
* ext/json/generator/depend: add build dependencies for json extension [Bug ruby#9374] [ruby-core:59609] * ext/json/parser/depend: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 22 16:51:36 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
+
 Sat Feb 22 16:34:12 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
@@ -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
@@ -1 +1,2 @@
+$(OBJS): $(ruby_headers)
 parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 67
+#define RUBY_PATCHLEVEL 68
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +Sat Feb 22 16:51:36 2014  Eric Wong <[email protected]>
++
 +	* ext/json/generator/depend: add build dependencies for json extension
 +	  [Bug #9374] [ruby-core:59609]
 +	* ext/json/parser/depend: ditto
++
 Sat Feb 22 16:34:12 2014  Yusuke Endoh  <[email protected]>
 	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+$(OBJS): $(ruby_headers)`
`1`	`2`	`generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+$(OBJS): $(ruby_headers)`
`1`	`2`	`parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h`