Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 694100 | Differences between
and this patch

Collapse All | Expand All

(-)a/node.gyp (-2 / +32 lines)
Lines 233-239 Link Here
233 
      'deps/acorn-plugins/acorn-static-class-features/index.js',
 233 
      'deps/acorn-plugins/acorn-static-class-features/index.js',
234 
    ],
 234 
    ],
235 
    'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
 235 
    'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
236 
    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
236 
    'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
 237 
    'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
238 
    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
237 
    'conditions': [
 239 
    'conditions': [
238 
      [ 'node_shared=="true"', {
 240 
      [ 'node_shared=="true"', {
239 
        'node_target_type%': 'shared_library',
 241 
        'node_target_type%': 'shared_library',
Lines 436-445 Link Here
436 
          ],
 438 
          ],
437 
          'actions': [
 439 
          'actions': [
438 
            {
 440 
            {
441 
              'action_name': 'run_pax_mkcodecache',
442 
              'inputs': [
443 
                '<(mkcodecache_exec)',
444 
              ],
445 
              'outputs': [
446 
                '<(mkcodecache_u_exec)',
447 
              ],
448 
              'action': [
449 
                'bash',
450 
                '-c',
451 
                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
452 
              ],
453 
            },
454 
            {
439 
              'action_name': 'run_mkcodecache',
 455 
              'action_name': 'run_mkcodecache',
440 
              'process_outputs_as_sources': 1,
 456 
              'process_outputs_as_sources': 1,
441 
              'inputs': [
 457 
              'inputs': [
442 
                '<(mkcodecache_exec)',
 458 
                '<(mkcodecache_u_exec)',
443 
              ],
 459 
              ],
444 
              'outputs': [
 460 
              'outputs': [
445 
                '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
 461 
                '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
Lines 461-470 Link Here
461 
          ],
 477 
          ],
462 
          'actions': [
 478 
          'actions': [
463 
            {
 479 
            {
480 
              'action_name': 'run_pax_mksnapshot',
481 
              'inputs': [
482 
                '<(node_mksnapshot_exec)',
483 
              ],
484 
              'outputs': [
485 
                '<(node_mksnapshot_u_exec)',
486 
              ],
487 
              'action': [
488 
                'bash',
489 
                '-c',
490 
                'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
491 
              ],
492 
            },
493 
            {
464 
              'action_name': 'node_mksnapshot',
 494 
              'action_name': 'node_mksnapshot',
465 
              'process_outputs_as_sources': 1,
 495 
              'process_outputs_as_sources': 1,
466 
              'inputs': [
 496 
              'inputs': [
467 
                '<(node_mksnapshot_exec)',
 497 
                '<(node_mksnapshot_u_exec)',
468 
              ],
 498 
              ],
469 
              'outputs': [
 499 
              'outputs': [
470 
                '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
 500 
                '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
(-)a/tools/v8_gypfiles/v8.gyp (-1 / +16 lines)
Lines 9-14 Link Here
9 
    'v8_vector_stores%': 0,
 9 
    'v8_vector_stores%': 0,
10 
    'v8_embed_script%': "",
 10 
    'v8_embed_script%': "",
11 
    'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
 11 
    'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
12 
    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
12 
    'v8_os_page_size%': 0,
 13 
    'v8_os_page_size%': 0,
13 
    'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
 14 
    'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
14 
    'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
 15 
    'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
Lines 427-432 Link Here
427 
      },
 425 
      },
428 
      'actions': [
 426 
      'actions': [
429 
        {
 427 
        {
428 
          'action_name': 'run_pax_mksnapshot',
429 
          'inputs': [
430 
            '<(mksnapshot_exec)',
431 
          ],
432 
          'outputs': [
433 
            '<(mksnapshot_u_exec)',
434 
          ],
435 
          'action': [
436 
            'bash',
437 
            '-c',
438 
            'mv <(mksnapshot_exec) <(mksnapshot_u_exec) && paxmark.sh m <(mksnapshot_u_exec)',
439 
          ],
440 
        },
441 
        {
430 
          'action_name': 'run_mksnapshot',
 442 
          'action_name': 'run_mksnapshot',
431 
          'message': 'generating: >@(_outputs)',
 443 
          'message': 'generating: >@(_outputs)',
432 
          'variables': {
 444 
          'variables': {
Lines 442-448 Link Here
442 
            ],
 454 
            ],
443 
          },
 455 
          },
444 
          'inputs': [
 456 
          'inputs': [
445 
            '<(mksnapshot_exec)',
 457 
            '<(mksnapshot_u_exec)',
446 
          ],
 458 
          ],
447 
          'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
 459 
          'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
448 
          'process_outputs_as_sources': 1,
 460 
          'process_outputs_as_sources': 1,

Return to bug 694100