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
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',
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',
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', 'glibc_nexe',
69 '<(DEPTH)/native_client/build/build_nexe.py',
70 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
71 + '-t', '<(DEPTH)/native_client/toolchain/',
74 '--build', 'glibc_nexe',
78 '<(DEPTH)/native_client/build/build_nexe.py',
79 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
80 + '-t', '<(DEPTH)/native_client/toolchain/',
83 '--build', 'glibc_nlib',
87 '<(DEPTH)/native_client/build/build_nexe.py',
88 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
89 + '-t', '<(DEPTH)/native_client/toolchain/',
92 '--build', 'glibc_nlib',
95 '<(DEPTH)/native_client/build/build_nexe.py',
97 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
98 + '-t', '<(DEPTH)/native_client/toolchain/',
100 '--build', 'glibc_nso',
101 '--root', '<(DEPTH)',
104 '<(DEPTH)/native_client/build/build_nexe.py',
106 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
107 + '-t', '<(DEPTH)/native_client/toolchain/',
109 '--build', 'glibc_nso',
110 '--root', '<(DEPTH)',
114 '<(DEPTH)/native_client/build/build_nexe.py',
115 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
116 + '-t', '<(DEPTH)/native_client/toolchain/',
119 '--build', 'newlib_pexe',
123 '<(DEPTH)/native_client/build/build_nexe.py',
124 - '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
125 + '-t', '<(DEPTH)/native_client/toolchain/',
128 '--build', 'newlib_plib',
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
132 'pnacl_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl',
135 + # create stamp.untar that build system depends on
136 + ['disable_newlib==0 and disable_newlib_untar==1', {
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)'],
146 ['disable_newlib==0 and disable_newlib_untar==0', {
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
153 'tool_name': 'newlib',
154 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
155 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
156 + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
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)',
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))',
179 'tool_name': 'newlib',
180 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
181 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
182 + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
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)',
187 '--root', '<(DEPTH)',
188 '--name', '>(out_newlib64)',
189 '--objdir', '>(objdir_newlib64)',
190 - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
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
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',
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)',
209 'tool_name': 'newlib',
210 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
211 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
212 + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
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)',
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))',
233 'tool_name': 'newlib',
234 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
235 +# make semaphore.h visible for base/shared_memory_nacl.cc compilation
236 + 'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl',
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',
241 '--root', '<(DEPTH)',
242 '--name', '>(out_newlib32)',
243 '--objdir', '>(objdir_newlib32)',
244 - '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
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)',
250 #--- /home/users/glen/rpm/packages/chromium-browser/autoupdate/beta/BUILD/chromium-browser-24.0.1312.45/src/native_client/src/untrusted/nacl/nacl.gyp 2012-12-19 10:03:43.000000000 +0200
251 #+++ ../../../chromium-browser-24.0.1312.45-almost-there/src/native_client/src/untrusted/nacl/nacl.gyp 2013-01-01 22:26:15.004609235 +0200
253 # 'nlib_target': 'libnacl.a',
256 #- 'build_pnacl_newlib': 1,
257 #+ 'build_pnacl_newlib': 0,
260 # '<@(sources_for_nacl_extensions)',
261 #--- chromium-browser-24.0.1312.45/src/native_client/tools.gyp~ 2012-12-19 10:04:23.000000000 +0200
262 #+++ chromium-browser-24.0.1312.45/src/native_client/tools.gyp 2013-01-01 17:22:30.098261613 +0200
264 # 'msvs_cygwin_shell': 0,
265 # 'description': 'Prep newlib',
267 #- '<(newlib_dir)/stamp.untar',
268 # '>!@pymod_do_main(prep_nacl_sdk --inputs --tool newlib)',
270 # 'outputs': ['<(newlib_dir)/stamp.prep'],
272 # 'msvs_cygwin_shell': 0,
273 # 'description': 'Prep glibc',
275 #- '<(glibc_dir)/stamp.untar',
276 # '>!@pymod_do_main(prep_nacl_sdk --inputs --tool glibc)',
278 # 'outputs': ['<(glibc_dir)/stamp.prep'],
280 # 'msvs_cygwin_shell': 0,
281 # 'description': 'Prep pnacl',
283 #- '<(pnacl_dir)/stamp.untar',
284 # '>!@pymod_do_main(prep_nacl_sdk --inputs --tool pnacl)',
286 # 'outputs': ['<(pnacl_dir)/stamp.prep'],
287 --- chromium-browser-28.0.1500.29/native_client/build/build_nexe.py 2013-05-29 12:09:15.000000000 +0300
288 +++ chromium-browser-27.0.1453.3/native_client/build/build_nexe.py 2013-03-27 03:16:47.000000000 +0200
290 # Set the toolchain directories
291 self.toolchain = os.path.join(options.toolpath, tooldir)
292 self.toolbin = os.path.join(self.toolchain, tool_subdir, 'bin')
293 - self.toolstamp = os.path.join(self.toolchain, 'stamp.prep')
294 - if not os.path.isfile(self.toolstamp):
295 - ErrOut('Could not find toolchain prep stamp file: %s' % (self.toolstamp))
297 self.inc_paths = ArgToList(options.incdirs)
298 self.lib_paths = ArgToList(options.libdirs)
302 def NeedsRebuild(self, outd, out, src, rebuilt=False):
303 - if not os.path.isfile(self.toolstamp):
305 - print 'Could not find toolchain stamp file %s.' % self.toolstamp
307 if not os.path.isfile(outd):
309 print 'Could not find dependency file %s.' % outd
312 print 'Could not find output file %s.' % out
314 - stamp_tm = GetMTime(self.toolstamp)
315 out_tm = GetMTime(out)
316 outd_tm = GetMTime(outd)
317 src_tm = GetMTime(src)
318 - if IsStale(out_tm, stamp_tm, rebuilt):
320 - print 'Output %s is older than toolchain stamp %s' % (out,
323 if IsStale(out_tm, src_tm, rebuilt):
325 print 'Output %s is older than source %s.' % (out, src)