]>
Commit | Line | Data |
---|---|---|
1ed01da3 ER |
1 | --- chromium-browser-24.0.1312.14/native_client/build/untrusted.gypi~ 2012-11-14 04:37:51.000000000 +0200 |
2 | +++ chromium-browser-24.0.1312.14/native_client/build/untrusted.gypi 2012-11-16 22:01:20.476042441 +0200 | |
126ea630 | 3 | @@ -162,7 +162,7 @@ |
9516ca97 ER |
4 | 'action': [ |
5 | '>(python_exe)', | |
6 | '<(DEPTH)/native_client/build/build_nexe.py', | |
7 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
8 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
9 | '>@(extra_args)', | |
10 | '--arch', 'x86-64', | |
11 | '--build', 'newlib_nexe', | |
126ea630 | 12 | @@ -203,7 +203,7 @@ |
9516ca97 ER |
13 | 'action': [ |
14 | '>(python_exe)', | |
15 | '<(DEPTH)/native_client/build/build_nexe.py', | |
16 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
17 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
18 | '>@(extra_args)', | |
19 | '--arch', 'x86-64', | |
20 | '--build', 'newlib_nlib', | |
126ea630 | 21 | @@ -244,7 +244,7 @@ |
9516ca97 ER |
22 | 'action': [ |
23 | '>(python_exe)', | |
24 | '<(DEPTH)/native_client/build/build_nexe.py', | |
25 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
26 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
27 | '>@(extra_args)', | |
28 | '--arch', 'x86-32', | |
29 | '--build', 'newlib_nexe', | |
126ea630 | 30 | @@ -285,7 +285,7 @@ |
9516ca97 ER |
31 | 'action': [ |
32 | '>(python_exe)', | |
33 | '<(DEPTH)/native_client/build/build_nexe.py', | |
34 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
35 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
36 | '>@(extra_args)', | |
37 | '--arch', 'x86-32', | |
38 | '--build', 'newlib_nlib', | |
126ea630 | 39 | @@ -331,7 +331,7 @@ |
9516ca97 ER |
40 | 'action': [ |
41 | '>(python_exe)', | |
42 | '<(DEPTH)/native_client/build/build_nexe.py', | |
43 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
44 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
45 | '>@(extra_args)', | |
46 | '--arch', 'arm', | |
47 | '--build', 'newlib_nexe', | |
126ea630 | 48 | @@ -371,7 +371,7 @@ |
9516ca97 ER |
49 | 'action': [ |
50 | '>(python_exe)', | |
51 | '<(DEPTH)/native_client/build/build_nexe.py', | |
52 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
53 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
54 | '>@(extra_args)', | |
55 | '--arch', 'arm', | |
56 | '--build', 'newlib_nlib', | |
126ea630 | 57 | @@ -418,7 +418,7 @@ |
9516ca97 ER |
58 | 'action': [ |
59 | '>(python_exe)', | |
60 | '<(DEPTH)/native_client/build/build_nexe.py', | |
61 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
62 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
63 | '>@(extra_args)', | |
64 | '--arch', 'x86-64', | |
65 | '--build', 'glibc_nexe', | |
126ea630 | 66 | @@ -459,7 +459,7 @@ |
9516ca97 ER |
67 | 'action': [ |
68 | '>(python_exe)', | |
69 | '<(DEPTH)/native_client/build/build_nexe.py', | |
70 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
71 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
72 | '>@(extra_args)', | |
73 | '--arch', 'x86-32', | |
74 | '--build', 'glibc_nexe', | |
126ea630 | 75 | @@ -500,7 +500,7 @@ |
9516ca97 ER |
76 | 'action': [ |
77 | '>(python_exe)', | |
78 | '<(DEPTH)/native_client/build/build_nexe.py', | |
79 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
80 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
81 | '>@(extra_args)', | |
82 | '--arch', 'x86-64', | |
83 | '--build', 'glibc_nlib', | |
126ea630 | 84 | @@ -541,7 +541,7 @@ |
9516ca97 ER |
85 | 'action': [ |
86 | '>(python_exe)', | |
87 | '<(DEPTH)/native_client/build/build_nexe.py', | |
88 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
89 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
90 | '>@(extra_args)', | |
91 | '--arch', 'x86-32', | |
92 | '--build', 'glibc_nlib', | |
126ea630 | 93 | @@ -583,7 +583,7 @@ |
9516ca97 ER |
94 | '>(python_exe)', |
95 | '<(DEPTH)/native_client/build/build_nexe.py', | |
96 | '>@(extra_args)', | |
97 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
98 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
99 | '--arch', 'x86-64', | |
100 | '--build', 'glibc_nso', | |
101 | '--root', '<(DEPTH)', | |
126ea630 | 102 | @@ -624,7 +624,7 @@ |
9516ca97 ER |
103 | '>(python_exe)', |
104 | '<(DEPTH)/native_client/build/build_nexe.py', | |
105 | '>@(extra_args)', | |
106 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
107 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
108 | '--arch', 'x86-32', | |
109 | '--build', 'glibc_nso', | |
110 | '--root', '<(DEPTH)', | |
126ea630 ER |
111 | @@ -702,7 +702,7 @@ |
112 | 'action': [ | |
113 | '>(python_exe)', | |
114 | '<(DEPTH)/native_client/build/build_nexe.py', | |
115 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
116 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
117 | '>@(extra_args)', | |
118 | '--arch', 'pnacl', | |
119 | '--build', 'newlib_pexe', | |
120 | @@ -743,7 +743,7 @@ | |
121 | 'action': [ | |
122 | '>(python_exe)', | |
123 | '<(DEPTH)/native_client/build/build_nexe.py', | |
124 | - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/', | |
125 | + '-t', '<(DEPTH)/native_client/toolchain/', | |
126 | '>@(extra_args)', | |
127 | '--arch', 'pnacl', | |
128 | '--build', 'newlib_plib', | |
1ed01da3 ER |
129 | --- chromium-browser-24.0.1312.45/native_client/tools.gyp~ 2012-12-19 10:04:23.000000000 +0200 |
130 | +++ chromium-browser-24.0.1312.45/native_client/tools.gyp 2013-01-01 23:40:30.933802957 +0200 | |
8fb1dc98 ER |
131 | @@ -44,6 +44,17 @@ |
132 | 'pnacl_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl', | |
133 | }, | |
134 | 'conditions': [ | |
135 | + # create stamp.untar that build system depends on | |
136 | + ['disable_newlib==0 and disable_newlib_untar==1', { | |
137 | + 'actions': [ | |
138 | + { | |
139 | + 'action_name': 'Touch newlib', | |
140 | + 'outputs': ['>(newlib_dir)/stamp.untar'], | |
141 | + 'inputs': [], # input is required. so let it be empty | |
142 | + 'action': ['touch', '<@(_outputs)'], | |
143 | + }, | |
144 | + ], | |
145 | + }], | |
146 | ['disable_newlib==0 and disable_newlib_untar==0', { | |
147 | 'actions': [ | |
148 | { | |
1ed01da3 ER |
149 | --- chromium-browser-24.0.1312.45/native_client/build/untrusted.gypi 2013-01-01 23:08:43.214443900 +0200 |
150 | +++ chromium-browser-24.0.1312.45-almost-there/native_client/build/untrusted.gypi 2013-01-01 22:50:53.863859341 +0200 | |
8fb1dc98 ER |
151 | @@ -142,6 +142,8 @@ |
152 | 'variables': { | |
153 | 'tool_name': 'newlib', | |
154 | 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib', | |
155 | +# make semaphore.h visible for base/shared_memory_nacl.cc compilation | |
71581184 | 156 | + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl', |
8fb1dc98 ER |
157 | 'out_newlib64%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x64.nexe', |
158 | 'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)', | |
159 | 'source_list_newlib64%': '<(tool_name)-x86-64.>(_target_name).source_list.gypcmd', | |
160 | @@ -169,11 +171,14 @@ | |
161 | '--root', '<(DEPTH)', | |
162 | '--name', '>(out_newlib64)', | |
163 | '--objdir', '>(objdir_newlib64)', | |
164 | - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)', | |
165 | +# FIXED | |
166 | + '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)', | |
167 | '--lib-dirs=>(lib_dirs_newlib64) ', | |
168 | '--compile_flags=-m64 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)', | |
169 | '--defines=^(defines) >(_defines)', | |
170 | - '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 ^(link_flags) >(_link_flags)', | |
171 | +# -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 | |
172 | +# ./src/out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/x86_64-nacl/lib/crt1.o | |
173 | + '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 -B<(newlib_dir)/lib ^(link_flags) >(_link_flags)', | |
174 | '--source-list=^|(<(source_list_newlib64) ^(_sources) ^(sources))', | |
175 | ], | |
176 | }, | |
177 | @@ -183,6 +188,8 @@ | |
178 | 'variables': { | |
179 | 'tool_name': 'newlib', | |
180 | 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib', | |
181 | +# make semaphore.h visible for base/shared_memory_nacl.cc compilation | |
71581184 | 182 | + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl', |
8fb1dc98 ER |
183 | 'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)', |
184 | 'source_list_newlib64%': '<(tool_name)-x86-64.>(_target_name).source_list.gypcmd', | |
185 | 'out_newlib64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nlib_target)', | |
186 | @@ -210,7 +217,19 @@ | |
187 | '--root', '<(DEPTH)', | |
188 | '--name', '>(out_newlib64)', | |
189 | '--objdir', '>(objdir_newlib64)', | |
190 | - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)', | |
191 | +#XXX | |
192 | +#glen@carme-pld src/base $ find .. -name semaphore.h | |
193 | +#../native_client/src/untrusted/pthread/semaphore.h | |
194 | +#../native_client_sdk/src/libraries/third_party/pthreads-win32/semaphore.h | |
195 | +#../out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/x86_64-nacl/include/semaphore.h | |
196 | +#../out/Release/obj/gen/sdk/toolchain/linux_x86_pnacl/newlib/sdk/include/include/semaphore.h | |
197 | +# | |
198 | +#-I/home/users/glen/rpm/packages/chromium-browser/autoupdate/beta/BU | |
199 | +#ILD/chromium-browser-24.0.1312.45/src/out/Release/obj/gen/tc_newlib/include | |
200 | +# 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib', | |
201 | +# 'newlib_dir__': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib', | |
202 | + | |
203 | + '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)', | |
204 | '--lib-dirs=>(lib_dirs_newlib64) ', | |
205 | '--compile_flags=-m64 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)', | |
206 | '--defines=^(defines) >(_defines)', | |
207 | @@ -224,6 +243,8 @@ | |
208 | 'variables': { | |
209 | 'tool_name': 'newlib', | |
210 | 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib', | |
211 | +# make semaphore.h visible for base/shared_memory_nacl.cc compilation | |
71581184 | 212 | + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl', |
8fb1dc98 ER |
213 | 'out_newlib32%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x32.nexe', |
214 | 'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)', | |
215 | 'source_list_newlib32%': '<(tool_name)-x86-32.>(_target_name).source_list.gypcmd', | |
216 | @@ -251,11 +272,12 @@ | |
217 | '--root', '<(DEPTH)', | |
218 | '--name', '>(out_newlib32)', | |
219 | '--objdir', '>(objdir_newlib32)', | |
220 | - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)', | |
221 | +# FIXED | |
222 | + '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)', | |
223 | '--lib-dirs=>(lib_dirs_newlib32)', | |
224 | '--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)', | |
225 | '--defines=^(defines) >(_defines)', | |
226 | - '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 ^(link_flags) >(_link_flags)', | |
227 | + '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 -B<(newlib_dir)/lib ^(link_flags) >(_link_flags)', | |
228 | '--source-list=^|(<(source_list_newlib32) ^(_sources) ^(sources))', | |
229 | ], | |
230 | }, | |
231 | @@ -265,6 +287,8 @@ | |
232 | 'variables': { | |
233 | 'tool_name': 'newlib', | |
234 | 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib', | |
235 | +# make semaphore.h visible for base/shared_memory_nacl.cc compilation | |
71581184 | 236 | + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl', |
8fb1dc98 ER |
237 | 'out_newlib32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nlib_target)', |
238 | 'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)', | |
239 | 'source_list_newlib32%': '<(tool_name)-x86-32.>(_target_name).source_list.gypcmd', | |
240 | @@ -292,7 +316,8 @@ | |
241 | '--root', '<(DEPTH)', | |
242 | '--name', '>(out_newlib32)', | |
243 | '--objdir', '>(objdir_newlib32)', | |
244 | - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)', | |
245 | +# FIXED | |
246 | + '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)', | |
247 | '--lib-dirs=>(lib_dirs_newlib32)', | |
248 | '--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)', | |
249 | '--defines=^(defines) >(_defines)', | |
71581184 ER |
250 | Could not find toolchain prep stamp file: ../native_client/toolchain/linux_x86_newlib/stamp.prep |
251 | Could not find toolchain prep stamp file: ../native_client/toolchain/linux_x86_newlib/stamp.prep | |
252 | make: *** [out/Release/obj/gen/tc_newlib/lib32/crtn.o] Error 1 | |
253 | make: *** Waiting for unfinished jobs.... | |
254 | make: *** [out/Release/obj/gen/tc_newlib/lib32/crti.o] Error 1 | |
255 | --- chromium-browser-29.0.1547.55/native_client/build/build_nexe.py~ 2013-08-16 19:08:10.000000000 +0300 | |
256 | +++ chromium-browser-29.0.1547.55/native_client/build/build_nexe.py 2013-08-18 14:05:01.071248669 +0300 | |
257 | @@ -201,9 +201,6 @@ | |
1ed01da3 ER |
258 | # Set the toolchain directories |
259 | self.toolchain = os.path.join(options.toolpath, tooldir) | |
260 | self.toolbin = os.path.join(self.toolchain, tool_subdir, 'bin') | |
261 | - self.toolstamp = os.path.join(self.toolchain, 'stamp.prep') | |
71581184 ER |
262 | - if not IsFile(self.toolstamp): |
263 | - raise Error('Could not find toolchain prep stamp file: ' + self.toolstamp) | |
1ed01da3 ER |
264 | |
265 | self.inc_paths = ArgToList(options.incdirs) | |
266 | self.lib_paths = ArgToList(options.libdirs) | |
71581184 | 267 | @@ -410,10 +407,6 @@ |
1ed01da3 ER |
268 | return path |
269 | ||
270 | def NeedsRebuild(self, outd, out, src, rebuilt=False): | |
71581184 | 271 | - if not IsFile(self.toolstamp): |
1ed01da3 | 272 | - if rebuilt: |
71581184 | 273 | - raise Error('Could not find toolchain stamp file %s.' % self.toolstamp) |
1ed01da3 | 274 | - return True |
71581184 | 275 | if not IsFile(outd): |
1ed01da3 | 276 | if rebuilt: |
71581184 ER |
277 | raise Error('Could not find dependency file %s.' % outd) |
278 | @@ -422,15 +415,9 @@ | |
1ed01da3 | 279 | if rebuilt: |
71581184 | 280 | raise Error('Could not find output file %s.' % out) |
1ed01da3 ER |
281 | return True |
282 | - stamp_tm = GetMTime(self.toolstamp) | |
283 | out_tm = GetMTime(out) | |
284 | outd_tm = GetMTime(outd) | |
285 | src_tm = GetMTime(src) | |
286 | - if IsStale(out_tm, stamp_tm, rebuilt): | |
287 | - if rebuilt: | |
71581184 ER |
288 | - raise Error('Output %s is older than toolchain stamp %s' % ( |
289 | - out, self.toolstamp)) | |
1ed01da3 ER |
290 | - return True |
291 | if IsStale(out_tm, src_tm, rebuilt): | |
292 | if rebuilt: | |
71581184 | 293 | raise Error('Output %s is older than source %s.' % (out, src)) |