Link libev and libeio as a normal .o instead of as .a

Using WAF "staticlib" to compile libev tends to confuse it with a system
version. Thanks to mr.binary42 for helping debug.

diff --git a/deps/libeio/wscript b/deps/libeio/wscript
index b4d89aa..2c49f71 100644 (file)
--- a/deps/libeio/wscript
+++ b/deps/libeio/wscript
@@ -108,7 +108,7 @@ def configure(conf):
   """, define_name="HAVE_SYNC_FILE_RANGE")
 
 def build(bld):
-  libeio = bld.new_task_gen("cc", "staticlib")
+  libeio = bld.new_task_gen("cc")
   libeio.source = "eio.c"
   libeio.target = 'eio'
   libeio.name = 'eio'

diff --git a/deps/libev/wscript b/deps/libev/wscript
index 59f63a6..9df51af 100644 (file)
--- a/deps/libev/wscript
+++ b/deps/libev/wscript
@@ -60,7 +60,7 @@ def configure(conf):
   conf.env.append_value('CXXFLAGS', ['-DEV_MULTIPLICITY=0'])
 
 def build(bld):
-  libev = bld.new_task_gen("cc", "staticlib")
+  libev = bld.new_task_gen("cc")
   libev.source = 'ev.c'
   libev.target = 'ev'
   libev.name = 'ev'

diff --git a/wscript b/wscript
index 2a8cde5..0e58841 100644 (file)
--- a/wscript
+++ b/wscript
@@ -337,7 +337,8 @@ def build(bld):
     deps/http_parser
     deps/coupling
   """
-  node.uselib_local = "evcom ev eio http_parser coupling"
+  node.add_objects = 'ev eio'
+  node.uselib_local = "evcom http_parser coupling"
   node.uselib = "UDNS V8 EXECINFO DL"
   node.install_path = '${PREFIX}/lib'
   node.install_path = '${PREFIX}/bin'