1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
diff -Nur ruby-2.2.3.orig/common.mk ruby-2.2.3/common.mk
--- ruby-2.2.3.orig/common.mk 2015-08-15 15:10:16.000000000 -0300
+++ ruby-2.2.3/common.mk 2015-08-20 01:58:55.065621626 -0300
@@ -15,7 +15,7 @@
RUBYLIB = $(PATH_SEPARATOR)
RUBYOPT = -
-RUN_OPTS = --disable-gems
+RUN_OPTS = --disable-gems -I$(srcdir)/../json-1.8.1/lib
SPEC_GIT_BASE = git://github.com/ruby
MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
@@ -729,8 +729,6 @@
srcs-ext: $(EXT_SRCS)
-srcs-extra: $(srcdir)/ext/json/parser/parser.c
-
LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
srcs-lib: $(LIB_SRCS)
@@ -817,11 +815,6 @@
top_srcdir=../.. srcdir=. \
RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
- $(ECHO) generating $@
- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
- Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
-
$(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
$(ECHO) generating $@
diff -Nur ruby-2.2.3.orig/defs/default_gems ruby-2.2.3/defs/default_gems
--- ruby-2.2.3.orig/defs/default_gems 2014-07-15 00:43:04.000000000 -0300
+++ ruby-2.2.3/defs/default_gems 2015-08-20 01:58:55.065621626 -0300
@@ -1,4 +1,3 @@
# gem base directory versioning file [executable files under bin]
rake lib/rake lib/rake.rb [rake]
rdoc lib/rdoc lib/rdoc.rb [rdoc ri]
-json ext/json ext/json/lib/json/version.rb
diff -Nur ruby-2.2.3.orig/ext/.document ruby-2.2.3/ext/.document
--- ruby-2.2.3.orig/ext/.document 2014-08-02 11:55:36.000000000 -0300
+++ ruby-2.2.3/ext/.document 2015-08-20 01:58:55.065621626 -0300
@@ -35,9 +35,6 @@
io/nonblock/nonblock.c
io/wait/lib
io/wait/wait.c
-json/ext/generator/generator.c
-json/ext/parser/parser.c
-json/lib
mathn/complex/complex.c
mathn/rational/rational.c
nkf/lib
diff -Nur ruby-2.2.3.orig/gems/bundled_gems ruby-2.2.3/gems/bundled_gems
--- ruby-2.2.3.orig/gems/bundled_gems 2014-12-12 11:00:15.000000000 -0200
+++ ruby-2.2.3/gems/bundled_gems 2015-08-20 01:58:55.065621626 -0300
@@ -1,3 +1,4 @@
power_assert 0.2.2
test-unit 3.0.8
minitest 5.4.3
+json 1.8.1
diff -Nur ruby-2.2.3.orig/test/ruby/test_module.rb ruby-2.2.3/test/ruby/test_module.rb
--- ruby-2.2.3.orig/test/ruby/test_module.rb 2015-04-12 12:41:32.000000000 -0300
+++ ruby-2.2.3/test/ruby/test_module.rb 2015-08-20 01:58:55.065621626 -0300
@@ -202,7 +202,6 @@
ancestors = Object.ancestors
mixins = ancestors - [Object, Kernel, BasicObject]
- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String)
assert_equal([Object, Kernel, BasicObject], ancestors - mixins)
assert_equal([String, Comparable, Object, Kernel, BasicObject], String.ancestors - mixins)
end
@@ -436,7 +435,6 @@
assert_equal([Mixin], User.included_modules)
mixins = Object.included_modules - [Kernel]
- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String)
assert_equal([Kernel], Object.included_modules - mixins)
assert_equal([Comparable, Kernel], String.included_modules - mixins)
end
|
