1 --- chromium-browser-33.0.1750.117/native_client/build/untrusted.gypi 2014-02-28 09:05:36.555378590 +0200
2 +++ chromium-browser-33.0.1750.117.patched/native_client/build/untrusted.gypi 2014-02-27 23:15:49.506025570 +0200
6 '<(DEPTH)/native_client/build/build_nexe.py',
7 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
8 + '-t', '<(DEPTH)/native_client/toolchain/',
11 '--build', 'newlib_nexe',
15 '<(DEPTH)/native_client/build/build_nexe.py',
16 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
17 + '-t', '<(DEPTH)/native_client/toolchain/',
20 '--build', 'newlib_nlib',
24 '<(DEPTH)/native_client/build/build_nexe.py',
25 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
26 + '-t', '<(DEPTH)/native_client/toolchain/',
29 '--build', 'newlib_nexe_pnacl',
33 '<(DEPTH)/native_client/build/build_nexe.py',
34 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
35 + '-t', '<(DEPTH)/native_client/toolchain/',
38 '--build', 'newlib_nlib_pnacl',
42 '<(DEPTH)/native_client/build/build_nexe.py',
43 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
44 + '-t', '<(DEPTH)/native_client/toolchain/',
47 '--build', 'newlib_nexe',
51 '<(DEPTH)/native_client/build/build_nexe.py',
52 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
53 + '-t', '<(DEPTH)/native_client/toolchain/',
56 '--build', 'newlib_nlib',
60 '<(DEPTH)/native_client/build/build_nexe.py',
61 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
62 + '-t', '<(DEPTH)/native_client/toolchain/',
65 '--build', 'newlib_nexe',
69 '<(DEPTH)/native_client/build/build_nexe.py',
70 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
71 + '-t', '<(DEPTH)/native_client/toolchain/',
74 '--build', 'newlib_nlib',
78 '<(DEPTH)/native_client/build/build_nexe.py',
79 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
80 + '-t', '<(DEPTH)/native_client/toolchain/',
83 '--build', 'newlib_nexe',
87 '<(DEPTH)/native_client/build/build_nexe.py',
88 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
89 + '-t', '<(DEPTH)/native_client/toolchain/',
92 '--build', 'newlib_nlib',
96 '<(DEPTH)/native_client/build/build_nexe.py',
97 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
98 + '-t', '<(DEPTH)/native_client/toolchain/',
101 '--build', 'newlib_nexe',
105 '<(DEPTH)/native_client/build/build_nexe.py',
106 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
107 + '-t', '<(DEPTH)/native_client/toolchain/',
110 '--build', 'newlib_nlib',
114 '<(DEPTH)/native_client/build/build_nexe.py',
115 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
116 + '-t', '<(DEPTH)/native_client/toolchain/',
119 '--build', 'newlib_nlib_pnacl',
123 '<(DEPTH)/native_client/build/build_nexe.py',
124 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
125 + '-t', '<(DEPTH)/native_client/toolchain/',
128 '--build', 'newlib_nexe',
132 '<(DEPTH)/native_client/build/build_nexe.py',
133 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
134 + '-t', '<(DEPTH)/native_client/toolchain/',
137 '--build', 'newlib_nlib',
141 '<(DEPTH)/native_client/build/build_nexe.py',
142 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
143 + '-t', '<(DEPTH)/native_client/toolchain/',
146 '--build', 'newlib_nexe',
150 '<(DEPTH)/native_client/build/build_nexe.py',
151 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
152 + '-t', '<(DEPTH)/native_client/toolchain/',
155 '--build', 'newlib_nlib',
159 '<(DEPTH)/native_client/build/build_nexe.py',
160 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
161 + '-t', '<(DEPTH)/native_client/toolchain/',
164 '--build', 'glibc_nexe',
165 @@ -1042,7 +1042,7 @@
168 '<(DEPTH)/native_client/build/build_nexe.py',
169 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
170 + '-t', '<(DEPTH)/native_client/toolchain/',
173 '--build', 'glibc_nexe',
174 @@ -1085,7 +1085,7 @@
177 '<(DEPTH)/native_client/build/build_nexe.py',
178 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
179 + '-t', '<(DEPTH)/native_client/toolchain/',
182 '--build', 'glibc_nlib',
183 @@ -1128,7 +1128,7 @@
186 '<(DEPTH)/native_client/build/build_nexe.py',
187 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
188 + '-t', '<(DEPTH)/native_client/toolchain/',
191 '--build', 'glibc_nlib',
192 @@ -1172,7 +1172,7 @@
194 '<(DEPTH)/native_client/build/build_nexe.py',
196 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
197 + '-t', '<(DEPTH)/native_client/toolchain/',
199 '--build', 'glibc_nso',
200 '--root', '<(DEPTH)',
201 @@ -1215,7 +1215,7 @@
203 '<(DEPTH)/native_client/build/build_nexe.py',
205 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
206 + '-t', '<(DEPTH)/native_client/toolchain/',
208 '--build', 'glibc_nso',
209 '--root', '<(DEPTH)',
210 @@ -1304,7 +1304,7 @@
213 '<(DEPTH)/native_client/build/build_nexe.py',
214 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
215 + '-t', '<(DEPTH)/native_client/toolchain/',
218 '--build', 'newlib_pexe',
219 @@ -1335,7 +1335,7 @@
222 '<(DEPTH)/native_client/build/build_nexe.py',
223 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
224 + '-t', '<(DEPTH)/native_client/toolchain/',
226 '--build', 'newlib_translate',
227 '--root', '<(DEPTH)',
228 @@ -1360,7 +1360,7 @@
231 '<(DEPTH)/native_client/build/build_nexe.py',
232 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
233 + '-t', '<(DEPTH)/native_client/toolchain/',
235 '--build', 'newlib_translate',
236 '--root', '<(DEPTH)',
237 @@ -1385,7 +1385,7 @@
240 '<(DEPTH)/native_client/build/build_nexe.py',
241 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
242 + '-t', '<(DEPTH)/native_client/toolchain/',
244 '--build', 'newlib_translate',
245 '--root', '<(DEPTH)',
246 @@ -1423,7 +1423,7 @@
249 '<(DEPTH)/native_client/build/build_nexe.py',
250 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
251 + '-t', '<(DEPTH)/native_client/toolchain/',
254 '--build', 'newlib_plib',
255 --- chromium-browser-33.0.1750.117/native_client/tools.gyp 2014-02-20 22:29:12.000000000 +0200
256 +++ chromium-browser-33.0.1750.117.patched/native_client/tools.gyp 2014-02-27 19:27:23.085288396 +0200
258 'arm_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_arm_newlib',
261 + # create stamp.untar that build system depends on
262 + ['disable_newlib==0 and disable_newlib_untar==1', {
265 + 'action_name': 'Touch newlib',
266 + 'outputs': ['>(newlib_dir)/stamp.untar'],
267 + 'inputs': [], # input is required. so let it be empty
268 + 'action': ['touch', '<@(_outputs)'],
272 ['disable_newlib==0 and disable_newlib_untar==0', {
275 --- chromium-browser-24.0.1312.45/native_client/build/untrusted.gypi 2013-01-01 23:08:43.214443900 +0200
276 +++ chromium-browser-24.0.1312.45-almost-there/native_client/build/untrusted.gypi 2013-01-01 22:50:53.863859341 +0200
279 'tool_name': 'newlib',
280 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
281 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
282 + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
283 'out_newlib64%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x64.nexe',
284 'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
285 'source_list_newlib64%': '<(tool_name)-x86-64.>(_target_name).source_list.gypcmd',
286 @@ -169,11 +171,14 @@
287 '--root', '<(DEPTH)',
288 '--name', '>(out_newlib64)',
289 '--objdir', '>(objdir_newlib64)',
290 - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
292 + '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)',
293 '--lib-dirs=>(lib_dirs_newlib64) ',
294 '--compile_flags=-m64 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
295 '--defines=^(defines) >(_defines)',
296 - '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 ^(link_flags) >(_link_flags)',
297 +# -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64
298 +# ./src/out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/x86_64-nacl/lib/crt1.o
299 + '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 -B<(newlib_dir)/lib ^(link_flags) >(_link_flags)',
300 '--source-list=^|(<(source_list_newlib64) ^(_sources) ^(sources))',
305 'tool_name': 'newlib',
306 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
307 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
308 + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
309 'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
310 'source_list_newlib64%': '<(tool_name)-x86-64.>(_target_name).source_list.gypcmd',
311 'out_newlib64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nlib_target)',
313 '--root', '<(DEPTH)',
314 '--name', '>(out_newlib64)',
315 '--objdir', '>(objdir_newlib64)',
316 - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
318 +#glen@carme-pld src/base $ find .. -name semaphore.h
319 +#../native_client/src/untrusted/pthread/semaphore.h
320 +#../native_client_sdk/src/libraries/third_party/pthreads-win32/semaphore.h
321 +#../out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/x86_64-nacl/include/semaphore.h
322 +#../out/Release/obj/gen/sdk/toolchain/linux_x86_pnacl/newlib/sdk/include/include/semaphore.h
324 +#-I/home/users/glen/rpm/packages/chromium-browser/autoupdate/beta/BU
325 +#ILD/chromium-browser-24.0.1312.45/src/out/Release/obj/gen/tc_newlib/include
326 +# 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
327 +# 'newlib_dir__': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib',
329 + '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)',
330 '--lib-dirs=>(lib_dirs_newlib64) ',
331 '--compile_flags=-m64 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
332 '--defines=^(defines) >(_defines)',
335 'tool_name': 'newlib',
336 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
337 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
338 + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
339 'out_newlib32%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x32.nexe',
340 'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
341 'source_list_newlib32%': '<(tool_name)-x86-32.>(_target_name).source_list.gypcmd',
342 @@ -251,11 +272,12 @@
343 '--root', '<(DEPTH)',
344 '--name', '>(out_newlib32)',
345 '--objdir', '>(objdir_newlib32)',
346 - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
348 + '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)',
349 '--lib-dirs=>(lib_dirs_newlib32)',
350 '--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
351 '--defines=^(defines) >(_defines)',
352 - '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 ^(link_flags) >(_link_flags)',
353 + '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 -B<(newlib_dir)/lib ^(link_flags) >(_link_flags)',
354 '--source-list=^|(<(source_list_newlib32) ^(_sources) ^(sources))',
359 'tool_name': 'newlib',
360 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
361 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
362 + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
363 'out_newlib32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nlib_target)',
364 'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
365 'source_list_newlib32%': '<(tool_name)-x86-32.>(_target_name).source_list.gypcmd',
367 '--root', '<(DEPTH)',
368 '--name', '>(out_newlib32)',
369 '--objdir', '>(objdir_newlib32)',
370 - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
372 + '--include-dirs=<(inst_dir)/include ^(include_dirs) <(newlib_dir)/include >(_include_dirs)',
373 '--lib-dirs=>(lib_dirs_newlib32)',
374 '--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
375 '--defines=^(defines) >(_defines)',
376 Could not find toolchain prep stamp file: ../native_client/toolchain/linux_x86_newlib/stamp.prep
377 Could not find toolchain prep stamp file: ../native_client/toolchain/linux_x86_newlib/stamp.prep
378 make: *** [out/Release/obj/gen/tc_newlib/lib32/crtn.o] Error 1
379 make: *** Waiting for unfinished jobs....
380 make: *** [out/Release/obj/gen/tc_newlib/lib32/crti.o] Error 1
381 --- chromium-browser-33.0.1750.117/native_client/build/build_nexe.py 2014-02-20 22:28:56.000000000 +0200
382 +++ chromium-browser-33.0.1750.117.patched/native_client/build/build_nexe.py 2014-02-27 19:27:23.085288396 +0200
384 # Set the toolchain directories
385 self.toolchain = os.path.join(options.toolpath, tooldir)
386 self.toolbin = os.path.join(self.toolchain, 'bin')
387 - self.toolstamp = os.path.join(self.toolchain, 'stamp.prep')
388 - if not IsFile(self.toolstamp):
389 - raise Error('Could not find toolchain prep stamp file: ' + self.toolstamp)
391 self.inc_paths = ArgToList(options.incdirs)
392 self.lib_paths = ArgToList(options.libdirs)
396 def NeedsRebuild(self, outd, out, src, rebuilt=False):
397 - if not IsFile(self.toolstamp):
399 - raise Error('Could not find toolchain stamp file %s.' % self.toolstamp)
403 raise Error('Could not find dependency file %s.' % outd)
406 raise Error('Could not find output file %s.' % out)
408 - stamp_tm = GetMTime(self.toolstamp)
409 out_tm = GetMTime(out)
410 outd_tm = GetMTime(outd)
411 src_tm = GetMTime(src)
412 - if IsStale(out_tm, stamp_tm, rebuilt):
414 - raise Error('Output %s is older than toolchain stamp %s' % (
415 - out, self.toolstamp))
417 if IsStale(out_tm, src_tm, rebuilt):
419 raise Error('Output %s is older than source %s.' % (out, src))