[packages/chromium-browser/DEVEL] another similar fix from gentoo

glen glen at pld-linux.org
Thu Jan 3 00:59:25 CET 2013


commit 4d449af96b530e2477f13170d8de3dd2920f750e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 3 01:54:44 2013 +0200

    another similar fix from gentoo
    
    can see later which variant was correct

 no-pnacl.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
---
diff --git a/no-pnacl.patch b/no-pnacl.patch
index 0cf7f46..bb00d1e 100644
--- a/no-pnacl.patch
+++ b/no-pnacl.patch
@@ -9,3 +9,23 @@
        },
        'sources': [
          '<@(sources_for_nacl_extensions)',
+--- a/src/native_client/build/untrusted.gypi	(revision 10450)
++++ b/src/native_client/build/untrusted.gypi	(working copy)
+@@ -771,7 +771,7 @@
+       ],
+     },
+     'target_conditions': [
+-      ['nexe_target!="" and build_pnacl_newlib!=0', {
++      ['nexe_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
+         'variables': {
+             'out_pnacl_newlib_x86_32_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32.nexe',
+             'out_pnacl_newlib_x86_64_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x64.nexe',
+@@ -889,7 +889,7 @@
+             }],
+           ],
+       }],
+-      ['nlib_target!="" and build_pnacl_newlib!=0', {
++      ['nlib_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
+         'variables': {
+           'tool_name': 'pnacl_newlib',
+           'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib',
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list