[packages/chromium-browser/dev-28] get nacl building

[glen]

commit 1ed01da3789ea9fc895c60120f6dc21326bdfab5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jun 9 18:58:08 2013 +0300

    get nacl building

 chromium-browser.spec |  3 ++-
 nacl-no-untar.patch   | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 47 insertions(+), 7 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 2ca4c8b..4998ee1 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -288,7 +288,7 @@ ln -s %{SOURCE7} .
 %patch16 -p1
 %patch28 -p1
 %patch25 -p2
-%patch18 -p2
+%patch18 -p1
 %patch24 -p2
 %patch26 -p2
 %patch31 -p0
@@ -335,6 +335,7 @@ ln -s %{_bindir}/x86_64-nacl-ranlib .
 ln -s %{_bindir}/x86_64-nacl-ranlib ranlib
 ln -s %{_bindir}/x86_64-nacl-strip .
 ln -s %{_bindir}/x86_64-nacl-strip strip
+ln -s %{_bindir}/x86_64-nacl-objcopy .
 ln -s %{_prefix}/x86_64-nacl/lib ../lib
 ln -s %{_prefix}/x86_64-nacl/lib32 ../lib32
 ln -s %{_prefix}/x86_64-nacl/include ../nacl/include
diff --git a/nacl-no-untar.patch b/nacl-no-untar.patch
index a53953c..b3c13d2 100644
--- a/nacl-no-untar.patch
+++ b/nacl-no-untar.patch
@@ -1,5 +1,5 @@
---- chromium-browser-24.0.1312.14/src/native_client/build/untrusted.gypi~	2012-11-14 04:37:51.000000000 +0200
-+++ chromium-browser-24.0.1312.14/src/native_client/build/untrusted.gypi	2012-11-16 22:01:20.476042441 +0200
+--- chromium-browser-24.0.1312.14/native_client/build/untrusted.gypi~	2012-11-14 04:37:51.000000000 +0200
++++ chromium-browser-24.0.1312.14/native_client/build/untrusted.gypi	2012-11-16 22:01:20.476042441 +0200
 @@ -162,7 +162,7 @@
                   'action': [
                     '>(python_exe)',
@@ -126,8 +126,8 @@
                '>@(extra_args)',
                '--arch', 'pnacl',
                '--build', 'newlib_plib',
---- chromium-browser-24.0.1312.45/src/native_client/tools.gyp~	2012-12-19 10:04:23.000000000 +0200
-+++ chromium-browser-24.0.1312.45/src/native_client/tools.gyp	2013-01-01 23:40:30.933802957 +0200
+--- chromium-browser-24.0.1312.45/native_client/tools.gyp~	2012-12-19 10:04:23.000000000 +0200
++++ chromium-browser-24.0.1312.45/native_client/tools.gyp	2013-01-01 23:40:30.933802957 +0200
 @@ -44,6 +44,17 @@
          'pnacl_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl',
        },
@@ -146,8 +146,8 @@
          ['disable_newlib==0 and disable_newlib_untar==0', {
            'actions': [
              {
---- chromium-browser-24.0.1312.45/src/native_client/build/untrusted.gypi	2013-01-01 23:08:43.214443900 +0200
-+++ chromium-browser-24.0.1312.45-almost-there/src/native_client/build/untrusted.gypi	2013-01-01 22:50:53.863859341 +0200
+--- chromium-browser-24.0.1312.45/native_client/build/untrusted.gypi	2013-01-01 23:08:43.214443900 +0200
++++ chromium-browser-24.0.1312.45-almost-there/native_client/build/untrusted.gypi	2013-01-01 22:50:53.863859341 +0200
 @@ -142,6 +142,8 @@
               'variables': {
                  'tool_name': 'newlib',
@@ -284,3 +284,42 @@
 #                  '>!@pymod_do_main(prep_nacl_sdk --inputs --tool pnacl)',
 #               ],
 #               'outputs': ['<(pnacl_dir)/stamp.prep'],
+--- chromium-browser-28.0.1500.29/native_client/build/build_nexe.py	2013-05-29 12:09:15.000000000 +0300
++++ chromium-browser-27.0.1453.3/native_client/build/build_nexe.py	2013-03-27 03:16:47.000000000 +0200
+@@ -154,9 +154,6 @@
+     # Set the toolchain directories
+     self.toolchain = os.path.join(options.toolpath, tooldir)
+     self.toolbin = os.path.join(self.toolchain, tool_subdir, 'bin')
+-    self.toolstamp = os.path.join(self.toolchain, 'stamp.prep')
+-    if not os.path.isfile(self.toolstamp):
+-      ErrOut('Could not find toolchain prep stamp file: %s' % (self.toolstamp))
+ 
+     self.inc_paths = ArgToList(options.incdirs)
+     self.lib_paths = ArgToList(options.libdirs)
+@@ -362,10 +314,6 @@
+     return path
+ 
+   def NeedsRebuild(self, outd, out, src, rebuilt=False):
+-    if not os.path.isfile(self.toolstamp):
+-      if rebuilt:
+-        print 'Could not find toolchain stamp file %s.' % self.toolstamp
+-      return True
+     if not os.path.isfile(outd):
+       if rebuilt:
+         print 'Could not find dependency file %s.' % outd
+@@ -374,15 +322,9 @@
+       if rebuilt:
+         print 'Could not find output file %s.' % out
+       return True
+-    stamp_tm = GetMTime(self.toolstamp)
+     out_tm = GetMTime(out)
+     outd_tm = GetMTime(outd)
+     src_tm = GetMTime(src)
+-    if IsStale(out_tm, stamp_tm, rebuilt):
+-      if rebuilt:
+-        print 'Output %s is older than toolchain stamp %s' % (out,
+-                                                              self.toolstamp)
+-      return True
+     if IsStale(out_tm, src_tm, rebuilt):
+       if rebuilt:
+         print 'Output %s is older than source %s.' % (out, src)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/1ed01da3789ea9fc895c60120f6dc21326bdfab5