summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2011-07-01 09:30:44 -0700
committerRyan Dahl <ry@tinyclouds.org>2011-07-01 09:30:44 -0700
commit412e413edc3864cf2d6da30b88248c0cbbe4e941 (patch)
treea8e55dfe2a8fce09614074162a08bf9e8ed20d74 /wscript
parent4c480551c3cc0b6f10ebe4c033580b3a3c148550 (diff)
downloadandroid-node-v8-412e413edc3864cf2d6da30b88248c0cbbe4e941.tar.gz
android-node-v8-412e413edc3864cf2d6da30b88248c0cbbe4e941.tar.bz2
android-node-v8-412e413edc3864cf2d6da30b88248c0cbbe4e941.zip
Upgrade libuv
Diffstat (limited to 'wscript')
-rw-r--r--wscript10
1 files changed, 2 insertions, 8 deletions
diff --git a/wscript b/wscript
index 7fd6315f95..e85ac1524f 100644
--- a/wscript
+++ b/wscript
@@ -358,8 +358,6 @@ def configure(conf):
if not conf.check(lib='kstat', uselib_store="KSTAT"):
conf.fatal("Cannot find kstat library")
- conf.sub_config('deps/libeio')
-
if conf.env['USE_SHARED_V8']:
v8_includes = [];
if o.shared_v8_includes: v8_includes.append(o.shared_v8_includes);
@@ -418,8 +416,6 @@ def configure(conf):
conf.env.append_value('CXXFLAGS', flags)
conf.env.append_value('LINKFLAGS', flags)
- # Needed for getaddrinfo in libeio
- conf.env.append_value("CPPFLAGS", "-DX_STACKSIZE=%d" % (1024*64))
# LFS
conf.env.append_value('CPPFLAGS', '-D_LARGEFILE_SOURCE')
conf.env.append_value('CPPFLAGS', '-D_FILE_OFFSET_BITS=64')
@@ -641,8 +637,6 @@ def build(bld):
print "Parallel Jobs: " + str(Options.options.jobs)
print "Product type: " + product_type
- bld.add_subdirs('deps/libeio')
-
build_uv(bld)
if not bld.env['USE_SHARED_V8']: build_v8(bld)
@@ -804,7 +798,7 @@ def build(bld):
node.name = "node"
node.target = "node"
node.uselib = 'RT OPENSSL CARES EXECINFO DL KVM SOCKET NSL KSTAT UTIL OPROFILE'
- node.add_objects = 'eio http_parser'
+ node.add_objects = 'http_parser'
if product_type_is_lib:
node.install_path = '${LIBDIR}'
else:
@@ -848,10 +842,10 @@ def build(bld):
node.includes = """
src/
- deps/libeio
deps/http_parser
deps/uv
deps/uv/ev
+ deps/uv/eio
"""
if not bld.env["USE_SHARED_V8"]: node.includes += ' deps/v8/include '