nacl-no-untar.patch

   1 --- chromium-browser-23.0.1271.64/src/native_client/tools.gyp~  2012-11-11 16:04:58.000000000 +0200
   2 +++ chromium-browser-23.0.1271.64/src/native_client/tools.gyp   2012-11-11 16:06:02.252718808 +0200
   3 @@ -35,7 +35,7 @@
   4          'disable_pnacl%': 0,
   5        },
   6        'conditions': [
   7 -        ['disable_newlib==0', {
   8 +        ['disable_newlib==0 and disable_newlib_untar==0', {
   9            'actions': [
  10              {
  11                'action_name': 'Untar newlib',
  12 @@ -58,7 +58,7 @@
  13              },
  14            ]
  15          }],
  16 -        ['disable_glibc==0', {
  17 +        ['disable_glibc==0 and disable_glibc_untar==0', {
  18            'actions': [
  19              {
  20                'action_name': 'Untar glibc',
  21 @@ -81,7 +81,7 @@
  22              },
  23            ]
  24          }],
  25 -        ['disable_pnacl==0', {
  26 +        ['disable_pnacl==0 and disable_pnacl_untar==0', {
  27            'actions': [
  28              {
  29                'action_name': 'Untar pnacl',
  30 --- chromium-browser-23.0.1271.64/src/native_client/build/untrusted.gypi~       2012-11-11 16:04:58.000000000 +0200
  31 +++ chromium-browser-23.0.1271.64/src/native_client/build/untrusted.gypi        2012-11-11 16:19:15.369299822 +0200
  32 @@ -168,7 +168,6 @@
  33                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  34                      '>@(extra_deps_newlib64)',
  35                      '>(source_list_newlib64)',
  36 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
  37                   ],
  38                   'outputs': ['>(out_newlib64)'],
  39                   'action': [
  40 @@ -209,7 +208,6 @@
  41                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  42                      '>@(extra_deps_newlib64)',
  43                      '>(source_list_newlib64)',
  44 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
  45                   ],
  46                   'outputs': ['>(out_newlib64)'],
  47                   'action': [
  48 @@ -250,7 +248,6 @@
  49                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  50                      '>@(extra_deps_newlib32)',
  51                      '>(source_list_newlib32)',
  52 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
  53                   ],
  54                   'outputs': ['>(out_newlib32)'],
  55                   'action': [
  56 @@ -291,7 +288,6 @@
  57                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  58                      '>@(extra_deps_newlib32)',
  59                      '>(source_list_newlib32)',
  60 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
  61                   ],
  62                   'outputs': ['>(out_newlib32)'],
  63                   'action': [
  64 @@ -424,7 +420,6 @@
  65                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  66                      '>@(extra_deps_glibc64)',
  67                      '>(source_list_glibc64)',
  68 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.untar',
  69                   ],
  70                   'outputs': ['>(out_glibc64)'],
  71                   'action': [
  72 @@ -465,7 +460,6 @@
  73                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  74                      '>@(extra_deps_glibc32)',
  75                      '>(source_list_glibc32)',
  76 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.untar',
  77                   ],
  78                   'outputs': ['>(out_glibc32)'],
  79                   'action': [
  80 @@ -506,7 +500,6 @@
  81                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  82                      '>@(extra_deps_glibc64)',
  83                      '>(source_list_glibc64)',
  84 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.untar',
  85                   ],
  86                   'outputs': ['>(out_glibc64)'],
  87                   'action': [
  88 @@ -547,7 +540,6 @@
  89                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  90                      '>@(extra_deps_glibc32)',
  91                      '>(source_list_glibc32)',
  92 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.untar',
  93                   ],
  94                   'outputs': ['>(out_glibc32)'],
  95                   'action': [
  96 @@ -588,7 +580,6 @@
  97                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
  98                      '>@(extra_deps_glibc64)',
  99                      '>(source_list_glibc64)',
 100 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
 101                   ],
 102                   'outputs': ['>(out_glibc64)'],
 103                   'action': [
 104 @@ -629,7 +620,6 @@
 105                      '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
 106                      '>@(extra_deps_glibc32)',
 107                      '>(source_list_glibc32)',
 108 -                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
 109                   ],
 110                   'outputs': ['>(out_glibc32)'],
 111                   'action': [
 112 --- chromium-browser-23.0.1271.64/src/native_client/build/untrusted.gypi~       2012-11-11 16:54:53.000000000 +0000
 113 +++ chromium-browser-23.0.1271.64/src/native_client/build/untrusted.gypi        2012-11-11 17:00:51.043248254 +0000
 114 @@ -173,7 +173,7 @@
 115                   'action': [
 116                     '>(python_exe)',
 117                     '<(DEPTH)/native_client/build/build_nexe.py',
 118 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 119 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 120                     '>@(extra_args)',
 121                     '--arch', 'x86-64',
 122                     '--build', 'newlib_nexe',
 123 @@ -213,7 +213,7 @@
 124                   'action': [
 125                     '>(python_exe)',
 126                     '<(DEPTH)/native_client/build/build_nexe.py',
 127 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 128 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 129                     '>@(extra_args)',
 130                     '--arch', 'x86-64',
 131                     '--build', 'newlib_nlib',
 132 @@ -253,7 +253,7 @@
 133                   'action': [
 134                     '>(python_exe)',
 135                     '<(DEPTH)/native_client/build/build_nexe.py',
 136 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 137 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 138                     '>@(extra_args)',
 139                     '--arch', 'x86-32',
 140                     '--build', 'newlib_nexe',
 141 @@ -293,7 +293,7 @@
 142                   'action': [
 143                     '>(python_exe)',
 144                     '<(DEPTH)/native_client/build/build_nexe.py',
 145 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 146 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 147                     '>@(extra_args)',
 148                     '--arch', 'x86-32',
 149                     '--build', 'newlib_nlib',
 150 @@ -339,7 +339,7 @@
 151                  'action': [
 152                    '>(python_exe)',
 153                    '<(DEPTH)/native_client/build/build_nexe.py',
 154 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 155 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 156                    '>@(extra_args)',
 157                    '--arch', 'arm',
 158                    '--build', 'newlib_nexe',
 159 @@ -379,7 +379,7 @@
 160                  'action': [
 161                    '>(python_exe)',
 162                    '<(DEPTH)/native_client/build/build_nexe.py',
 163 -                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 164 +                  '-t', '<(DEPTH)/native_client/toolchain/',
 165                    '>@(extra_args)',
 166                    '--arch', 'arm',
 167                    '--build', 'newlib_nlib',
 168 @@ -425,7 +425,7 @@
 169                   'action': [
 170                     '>(python_exe)',
 171                     '<(DEPTH)/native_client/build/build_nexe.py',
 172 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 173 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 174                     '>@(extra_args)',
 175                     '--arch', 'x86-64',
 176                     '--build', 'glibc_nexe',
 177 @@ -465,7 +465,7 @@
 178                   'action': [
 179                     '>(python_exe)',
 180                     '<(DEPTH)/native_client/build/build_nexe.py',
 181 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 182 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 183                     '>@(extra_args)',
 184                     '--arch', 'x86-32',
 185                     '--build', 'glibc_nexe',
 186 @@ -505,7 +505,7 @@
 187                   'action': [
 188                     '>(python_exe)',
 189                     '<(DEPTH)/native_client/build/build_nexe.py',
 190 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 191 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 192                     '>@(extra_args)',
 193                     '--arch', 'x86-64',
 194                     '--build', 'glibc_nlib',
 195 @@ -545,7 +545,7 @@
 196                   'action': [
 197                     '>(python_exe)',
 198                     '<(DEPTH)/native_client/build/build_nexe.py',
 199 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 200 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 201                     '>@(extra_args)',
 202                     '--arch', 'x86-32',
 203                     '--build', 'glibc_nlib',
 204 @@ -586,7 +586,7 @@
 205                     '>(python_exe)',
 206                     '<(DEPTH)/native_client/build/build_nexe.py',
 207                     '>@(extra_args)',
 208 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 209 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 210                     '--arch', 'x86-64',
 211                     '--build', 'glibc_nso',
 212                     '--root', '<(DEPTH)',
 213 @@ -626,7 +626,7 @@
 214                     '>(python_exe)',
 215                     '<(DEPTH)/native_client/build/build_nexe.py',
 216                     '>@(extra_args)',
 217 -                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
 218 +                   '-t', '<(DEPTH)/native_client/toolchain/',
 219                     '--arch', 'x86-32',
 220                     '--build', 'glibc_nso',
 221                     '--root', '<(DEPTH)',