Commit | Line | Data |
---|---|---|
6e5487ca LP |
1 | diff -uNr ruby-2.4.2/addr2line.c ruby-2.4.2.mod/addr2line.c |
2 | --- ruby-2.4.2/addr2line.c 2016-10-18 18:09:08.000000000 +0300 | |
3 | +++ ruby-2.4.2.mod/addr2line.c 2017-09-15 12:00:56.242805138 +0300 | |
4 | @@ -440,7 +440,7 @@ | |
5 | /* Ideally we should check 4 paths to follow gnu_debuglink, | |
6 | but we handle only one case for now as this format is used | |
7 | by some linux distributions. See GDB's info for detail. */ | |
8 | - static const char global_debug_dir[] = "/usr/lib/debug"; | |
9 | + static const char global_debug_dir[] = "@TERMUX_PREFIX@/lib/debug"; | |
10 | char *p, *subdir; | |
11 | obj_info_t *o1 = *objp, *o2; | |
12 | ||
13 | diff -uNr ruby-2.4.2/dln_find.c ruby-2.4.2.mod/dln_find.c | |
14 | --- ruby-2.4.2/dln_find.c 2016-06-02 19:52:15.000000000 +0300 | |
15 | +++ ruby-2.4.2.mod/dln_find.c 2017-09-15 12:00:28.522805158 +0300 | |
16 | @@ -72,6 +72,10 @@ | |
17 | ||
18 | if (!path) { | |
19 | path = | |
20 | + "@TERMUX_PREFIX@/bin" PATH_SEP | |
21 | + "@TERMUX_PREFIX@/bin/applets" PATH_SEP | |
22 | + "/system/xbin" PATH_SEP | |
23 | + "/system/bin" PATH_SEP | |
24 | "/usr/local/bin" PATH_SEP | |
25 | "/usr/ucb" PATH_SEP | |
26 | "/usr/bin" PATH_SEP | |
27 | diff -uNr ruby-2.4.2/lib/drb/gw.rb ruby-2.4.2.mod/lib/drb/gw.rb | |
28 | --- ruby-2.4.2/lib/drb/gw.rb 2015-12-16 07:07:31.000000000 +0200 | |
29 | +++ ruby-2.4.2.mod/lib/drb/gw.rb 2017-09-15 12:06:04.592804917 +0300 | |
30 | @@ -99,8 +99,8 @@ | |
31 | ||
32 | front = DRb::GW.new | |
33 | ||
34 | -s1 = DRb::DRbServer.new('drbunix:/tmp/gw_b_a', front) | |
35 | -s2 = DRb::DRbServer.new('drbunix:/tmp/gw_b_c', front) | |
36 | +s1 = DRb::DRbServer.new('drbunix:@TERMUX_PREFIX@/tmp/gw_b_a', front) | |
37 | +s2 = DRb::DRbServer.new('drbunix:@TERMUX_PREFIX@/tmp/gw_b_c', front) | |
38 | ||
39 | s1.thread.join | |
40 | s2.thread.join | |
41 | @@ -131,9 +131,9 @@ | |
42 | require 'foo' | |
43 | ||
44 | obj = Foo.new('a') | |
45 | -DRb.start_service("drbunix:/tmp/gw_a", obj) | |
46 | +DRb.start_service("drbunix:@TERMUX_PREFIX@/tmp/gw_a", obj) | |
47 | ||
48 | -robj = DRbObject.new_with_uri('drbunix:/tmp/gw_b_a') | |
49 | +robj = DRbObject.new_with_uri('drbunix:@TERMUX_PREFIX@/tmp/gw_b_a') | |
50 | robj[:a] = obj | |
51 | ||
52 | DRb.thread.join | |
53 | @@ -146,9 +146,9 @@ | |
54 | ||
55 | foo = Foo.new('c', nil) | |
56 | ||
57 | -DRb.start_service("drbunix:/tmp/gw_c", nil) | |
58 | +DRb.start_service("drbunix:@TERMUX_PREFIX@/tmp/gw_c", nil) | |
59 | ||
60 | -robj = DRbObject.new_with_uri("drbunix:/tmp/gw_b_c") | |
61 | +robj = DRbObject.new_with_uri("drbunix:@TERMUX_PREFIX@/tmp/gw_b_c") | |
62 | ||
63 | puts "c->b" | |
64 | a = robj[:a] | |
65 | diff -uNr ruby-2.4.2/lib/mkmf.rb ruby-2.4.2.mod/lib/mkmf.rb | |
66 | --- ruby-2.4.2/lib/mkmf.rb 2017-09-15 11:42:55.362805911 +0300 | |
67 | +++ ruby-2.4.2.mod/lib/mkmf.rb 2017-09-15 13:57:38.032800130 +0300 | |
68 | @@ -1551,7 +1551,7 @@ | |
69 | if path ||= ENV['PATH'] | |
70 | path = path.split(File::PATH_SEPARATOR) | |
71 | else | |
72 | - path = %w[/usr/local/bin /usr/ucb /usr/bin /bin] | |
73 | + path = %w[@TERMUX_PREFIX@/bin @TERMUX_PREFIX@/bin/applets /system/xbin /system/bin /usr/local/bin /usr/ucb /usr/bin /bin] | |
74 | end | |
75 | file = nil | |
76 | path.each do |dir| | |
77 | diff -uNr ruby-2.4.2/lib/resolv.rb ruby-2.4.2.mod/lib/resolv.rb | |
78 | --- ruby-2.4.2/lib/resolv.rb 2016-11-24 01:57:30.000000000 +0200 | |
79 | +++ ruby-2.4.2.mod/lib/resolv.rb 2017-09-15 13:49:49.152800465 +0300 | |
80 | @@ -172,7 +172,7 @@ | |
81 | require 'win32/resolv' | |
82 | DefaultFileName = Win32::Resolv.get_hosts_path | |
83 | rescue LoadError | |
84 | - DefaultFileName = '/etc/hosts' | |
85 | + DefaultFileName = '@TERMUX_PREFIX@/etc/hosts' | |
86 | end | |
87 | ||
88 | ## | |
89 | @@ -957,7 +957,7 @@ | |
90 | return { :nameserver => nameserver, :search => search, :ndots => ndots } | |
91 | end | |
92 | ||
93 | - def Config.default_config_hash(filename="/etc/resolv.conf") | |
94 | + def Config.default_config_hash(filename="@TERMUX_PREFIX@/etc/resolv.conf") | |
95 | if File.exist? filename | |
96 | config_hash = Config.parse_resolv_conf(filename) | |
97 | else | |
98 | diff -uNr ruby-2.4.2/lib/rubygems/config_file.rb ruby-2.4.2.mod/lib/rubygems/config_file.rb | |
99 | --- ruby-2.4.2/lib/rubygems/config_file.rb 2016-09-28 03:57:53.000000000 +0300 | |
100 | +++ ruby-2.4.2.mod/lib/rubygems/config_file.rb 2017-09-15 13:47:05.912800582 +0300 | |
101 | @@ -81,7 +81,7 @@ | |
102 | ||
103 | path.strip | |
104 | rescue LoadError | |
105 | - RbConfig::CONFIG["sysconfdir"] || "/etc" | |
106 | + RbConfig::CONFIG["sysconfdir"] || "@TERMUX_PREFIX@/etc" | |
107 | end | |
108 | end | |
109 | ||
110 | diff -uNr ruby-2.4.2/lib/rubygems/defaults.rb ruby-2.4.2.mod/lib/rubygems/defaults.rb | |
111 | --- ruby-2.4.2/lib/rubygems/defaults.rb 2017-09-15 11:42:55.262805911 +0300 | |
112 | +++ ruby-2.4.2.mod/lib/rubygems/defaults.rb 2017-09-15 13:59:05.152800068 +0300 | |
113 | @@ -116,7 +116,7 @@ | |
114 | ||
115 | def self.default_bindir | |
116 | if defined? RUBY_FRAMEWORK_VERSION then # mac framework support | |
117 | - '/usr/bin' | |
118 | + '@TERMUX_PREFIX@/bin' | |
119 | else # generic install | |
120 | RbConfig::CONFIG['bindir'] | |
121 | end | |
122 | diff -uNr ruby-2.4.2/lib/webrick/config.rb ruby-2.4.2.mod/lib/webrick/config.rb | |
123 | --- ruby-2.4.2/lib/webrick/config.rb 2016-12-07 14:59:48.000000000 +0200 | |
124 | +++ ruby-2.4.2.mod/lib/webrick/config.rb 2017-09-15 12:03:02.402805048 +0300 | |
125 | @@ -35,7 +35,7 @@ | |
126 | :Logger => nil, # default: WEBrick::Log.new | |
127 | :ServerSoftware => "WEBrick/#{WEBrick::VERSION} " + | |
128 | "(Ruby/#{RUBY_VERSION}/#{RUBY_RELEASE_DATE})", | |
129 | - :TempDir => ENV['TMPDIR']||ENV['TMP']||ENV['TEMP']||'/tmp', | |
130 | + :TempDir => ENV['TMPDIR']||ENV['TMP']||ENV['TEMP']||'@TERMUX_PREFIX@/tmp', | |
131 | :DoNotListen => false, | |
132 | :StartCallback => nil, | |
133 | :StopCallback => nil, |