http: add 308 status_code, see RFC7238

[platform/upstream/nodejs.git] / configure

diff --git a/configure b/configure
index b950bdc..daea8ca 100755 (executable)
--- a/configure
+++ b/configure
@@ -204,6 +204,11 @@ parser.add_option('--tag',
     dest='tag',
     help='custom build tag')
 
+parser.add_option('--v8-options',
+    action='store',
+    dest='v8_options',
+    help='v8 options to pass, see `node --v8-options` for examples.')
+
 parser.add_option('--with-arm-float-abi',
     action='store',
     dest='arm_float_abi',
@@ -431,7 +436,7 @@ def configure_arm(o):
   elif is_arm_hard_float_abi():
     arm_float_abi = 'hard'
   else:
-    'default'
+    arm_float_abi = 'default'
   o['variables']['armv7'] = int(is_arch_armv7())
   o['variables']['arm_fpu'] = 'vfpv3'  # V8 3.18 no longer supports VFP2.
   o['variables']['arm_neon'] = int(is_arm_neon())
@@ -451,6 +456,9 @@ def configure_node(o):
   o['variables']['host_arch'] = host_arch
   o['variables']['target_arch'] = target_arch
 
+  if target_arch != host_arch and not options.without_snapshot:
+    o['variables']['want_separate_host_toolset'] = 1
+
   if target_arch == 'arm':
     configure_arm(o)
 
@@ -464,13 +472,15 @@ def configure_node(o):
   if not is_clang and cc_version < (4,0,0):
     o['variables']['visibility'] = ''
 
-  if flavor in ('solaris', 'mac', 'linux'):
+  if flavor in ('solaris', 'mac', 'linux', 'freebsd'):
     use_dtrace = not options.without_dtrace
-    # Don't enable by default on linux, it needs the sdt-devel package.
+    # Don't enable by default on linux and freebsd
+    if flavor in ('linux', 'freebsd'):
+      use_dtrace = options.with_dtrace
+
     if flavor == 'linux':
       if options.systemtap_includes:
         o['include_dirs'] += [options.systemtap_includes]
-      use_dtrace = options.with_dtrace
     o['variables']['node_use_dtrace'] = b(use_dtrace)
     o['variables']['uv_use_dtrace'] = b(use_dtrace)
     o['variables']['uv_parent_path'] = '/deps/uv/'
@@ -511,6 +521,9 @@ def configure_node(o):
   else:
     o['variables']['node_tag'] = ''
 
+  if options.v8_options:
+    o['variables']['node_v8_options'] = options.v8_options.replace('"', '\\"')
+
 
 def configure_libz(o):
   o['variables']['node_shared_zlib'] = b(options.shared_zlib)
@@ -560,6 +573,9 @@ def configure_libuv(o):
   # assume shared libuv if one of these is set?
   if options.shared_libuv_libpath:
     o['libraries'] += ['-L%s' % options.shared_libuv_libpath]
+  else:
+    o['variables']['uv_library'] = 'static_library'
+
   if options.shared_libuv_libname:
     o['libraries'] += ['-l%s' % options.shared_libuv_libname]
   elif options.shared_libuv: