]>
Commit | Line | Data |
---|---|---|
21952d78 | 1 | --- node-v0.1.31/wscript 2010-03-05 18:55:13.000000000 -0700 |
2 | +++ node-working-messy/wscript 2010-03-10 00:05:02.000000000 -0700 | |
3 | @@ -247,16 +247,13 @@ | |
4 | ||
5 | def build_v8(bld): | |
6 | v8 = bld.new_task_gen( | |
7 | - source = 'deps/v8/SConstruct ' | |
8 | - + bld.path.ant_glob('v8/include/*') | |
9 | - + bld.path.ant_glob('v8/src/*'), | |
10 | - target = bld.env["staticlib_PATTERN"] % "v8", | |
11 | - rule = v8_cmd(bld, "default"), | |
12 | + source = '', | |
13 | + rule = '', | |
14 | before = "cxx", | |
15 | install_path = None | |
16 | ) | |
17 | v8.uselib = "EXECINFO" | |
18 | - bld.env["CPPPATH_V8"] = "deps/v8/include" | |
19 | + bld.env["CPPPATH_V8"] = "/usr/include" | |
20 | t = join(bld.srcnode.abspath(bld.env_of_name("default")), v8.target) | |
21 | if sys.platform.startswith("sunos"): | |
22 | bld.env_of_name('default')["LINKFLAGS_V8"] = ["-mt", t] | |
23 | @@ -275,13 +272,12 @@ | |
24 | else: | |
25 | bld.env_of_name('debug')["LINKFLAGS_V8"] = ["-pthread", t] | |
26 | ||
27 | - bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h') | |
28 | + bld.install_files('${PREFIX}/include/node/') | |
29 | ||
30 | def build(bld): | |
31 | bld.add_subdirs('deps/libeio deps/libev') | |
32 | ||
33 | build_udns(bld) | |
34 | - build_v8(bld) | |
35 | ||
36 | ### evcom | |
37 | evcom = bld.new_task_gen("cc") | |
38 | @@ -370,6 +366,7 @@ | |
39 | node.add_objects = 'ev eio evcom http_parser coupling' | |
40 | node.uselib_local = '' | |
41 | node.uselib = 'GNUTLS GPGERROR UDNS V8 EXECINFO DL KVM SOCKET NSL' | |
42 | + node.env["LINKFLAGS_V8"] = ["-lpthread", '-lv8'] | |
43 | ||
44 | node.install_path = '${PREFIX}/lib' | |
45 | node.install_path = '${PREFIX}/bin' |