chiark - git - mdw - termux-packages/blob - packages/nodejs-current/node.gyp.patch

   1 diff -u -r ../node-v8.1.0/node.gyp ./node.gyp
   2 --- ../node-v8.1.0/node.gyp     2017-06-08 12:31:34.000000000 +0200
   3 +++ ./node.gyp  2017-06-12 12:13:40.219057425 +0200
   4 @@ -557,156 +557,6 @@
   5            ],
   6          } ],
   7        ]
   8 -    },
   9 -    {
  10 -      'target_name': 'cctest',
  11 -      'type': 'executable',
  12 -
  13 -      'dependencies': [
  14 -        '<(node_core_target_name)',
  15 -        'deps/gtest/gtest.gyp:gtest',
  16 -        'node_js2c#host',
  17 -        'node_dtrace_header',
  18 -        'node_dtrace_ustack',
  19 -        'node_dtrace_provider',
  20 -      ],
  21 -
  22 -      'variables': {
  23 -        'OBJ_PATH': '<(OBJ_DIR)/node/src',
  24 -        'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen',
  25 -        'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing',
  26 -        'OBJ_SUFFIX': 'o',
  27 -        'OBJ_SEPARATOR': '/',
  28 -        'conditions': [
  29 -          ['OS=="win"', {
  30 -            'OBJ_SUFFIX': 'obj',
  31 -          }],
  32 -          ['GENERATOR=="ninja"', {
  33 -            'OBJ_PATH': '<(OBJ_DIR)/src',
  34 -            'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
  35 -            'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
  36 -            'OBJ_SEPARATOR': '/node.',
  37 -          }, {
  38 -            'conditions': [
  39 -              ['OS=="win"', {
  40 -                'OBJ_PATH': '<(OBJ_DIR)/node',
  41 -                'OBJ_GEN_PATH': '<(OBJ_DIR)/node',
  42 -                'OBJ_TRACING_PATH': '<(OBJ_DIR)/node',
  43 -              }],
  44 -              ['OS=="aix"', {
  45 -                'OBJ_PATH': '<(OBJ_DIR)/node_base/src',
  46 -                'OBJ_GEN_PATH': '<(OBJ_DIR)/node_base/gen',
  47 -                'OBJ_TRACING_PATH': '<(OBJ_DIR)/node_base/src/tracing',
  48 -              }],
  49 -            ]}
  50 -          ]
  51 -        ],
  52 -       },
  53 -
  54 -      'includes': [
  55 -        'node.gypi'
  56 -      ],
  57 -
  58 -      'include_dirs': [
  59 -        'src',
  60 -        'tools/msvs/genfiles',
  61 -        'deps/v8/include',
  62 -        'deps/cares/include',
  63 -        'deps/uv/include',
  64 -        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
  65 -      ],
  66 -
  67 -      'libraries': [
  68 -        '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
  69 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
  70 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)',
  71 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
  72 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
  73 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
  74 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
  75 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
  76 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
  77 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
  78 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
  79 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
  80 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
  81 -        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_revert.<(OBJ_SUFFIX)',
  82 -        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
  83 -        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
  84 -        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
  85 -        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
  86 -      ],
  87 -
  88 -      'defines': [
  89 -        # gtest's ASSERT macros conflict with our own.
  90 -        'GTEST_DONT_DEFINE_ASSERT_EQ=1',
  91 -        'GTEST_DONT_DEFINE_ASSERT_GE=1',
  92 -        'GTEST_DONT_DEFINE_ASSERT_GT=1',
  93 -        'GTEST_DONT_DEFINE_ASSERT_LE=1',
  94 -        'GTEST_DONT_DEFINE_ASSERT_LT=1',
  95 -        'GTEST_DONT_DEFINE_ASSERT_NE=1',
  96 -        'NODE_WANT_INTERNALS=1',
  97 -      ],
  98 -
  99 -      'sources': [
 100 -        'test/cctest/test_base64.cc',
 101 -        'test/cctest/test_environment.cc',
 102 -        'test/cctest/test_util.cc',
 103 -        'test/cctest/test_url.cc'
 104 -      ],
 105 -
 106 -      'sources!': [
 107 -        'src/node_main.cc'
 108 -      ],
 109 -
 110 -      'conditions': [
 111 -        ['v8_enable_inspector==1', {
 112 -          'sources': [
 113 -            'test/cctest/test_inspector_socket.cc',
 114 -            'test/cctest/test_inspector_socket_server.cc'
 115 -          ],
 116 -          'conditions': [
 117 -            [ 'node_shared_zlib=="false"', {
 118 -              'dependencies': [
 119 -                'deps/zlib/zlib.gyp:zlib',
 120 -              ]
 121 -            }],
 122 -            [ 'node_shared_openssl=="false" and node_shared=="false"', {
 123 -              'dependencies': [
 124 -                'deps/openssl/openssl.gyp:openssl'
 125 -              ]
 126 -            }],
 127 -            [ 'node_shared_http_parser=="false"', {
 128 -              'dependencies': [
 129 -                'deps/http_parser/http_parser.gyp:http_parser'
 130 -              ]
 131 -            }],
 132 -            [ 'node_shared_libuv=="false"', {
 133 -              'dependencies': [
 134 -                'deps/uv/uv.gyp:libuv'
 135 -              ]
 136 -            }]
 137 -          ]
 138 -        }],
 139 -        [ 'node_use_v8_platform=="true"', {
 140 -          'dependencies': [
 141 -            'deps/v8/src/v8.gyp:v8_libplatform',
 142 -          ],
 143 -        }],
 144 -        [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
 145 -          'copies': [{
 146 -            'destination': '<(OBJ_DIR)/cctest/src',
 147 -            'files': [
 148 -              '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)',
 149 -              '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)',
 150 -              '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
 151 -            ]},
 152 -          ],
 153 -        }],
 154 -        ['OS=="solaris"', {
 155 -          'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
 156 -        }],
 157 -      ]
 158      }
 159    ], # end targets
 160