diff options
| author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2014-10-21 00:45:30 +0200 |
|---|---|---|
| committer | Trevor Norris <trev.norris@gmail.com> | 2014-11-05 16:49:57 -0800 |
| commit | ce112c27c636ba17129d6061f8db636a80faeb48 (patch) | |
| tree | 50e2a8185185b31573fe57b2d33cbf7dfa7529bc /deps/uv/Makefile.am | |
| parent | 28ae70ebad8debd8aa7b521a693aa3de89ad84d6 (diff) | |
| download | android-node-v8-ce112c27c636ba17129d6061f8db636a80faeb48.tar.gz android-node-v8-ce112c27c636ba17129d6061f8db636a80faeb48.tar.bz2 android-node-v8-ce112c27c636ba17129d6061f8db636a80faeb48.zip | |
deps: update uv to v1.0.0-rc2
PR-URL: https://github.com/joyent/node/pull/8566
Reviewed-by: Fedor Indutny <fedor@indutny.com>
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/uv/Makefile.am')
| -rw-r--r-- | deps/uv/Makefile.am | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/deps/uv/Makefile.am b/deps/uv/Makefile.am index 06a5532ef2..07d628d3e4 100644 --- a/deps/uv/Makefile.am +++ b/deps/uv/Makefile.am @@ -106,6 +106,9 @@ libuv_la_SOURCES += src/unix/async.c \ endif # WINNT +EXTRA_DIST = test/fixtures/empty_file \ + test/fixtures/load_error.node + TESTS = test/run-tests check_PROGRAMS = test/run-tests test_run_tests_CFLAGS = @@ -203,6 +206,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \ test/test-tcp-writealot.c \ test/test-tcp-try-write.c \ test/test-tcp-write-queue-order.c \ + test/test-thread-equal.c \ test/test-thread.c \ test/test-threadpool-cancel.c \ test/test-threadpool.c \ @@ -268,6 +272,11 @@ libuv_la_SOURCES += src/unix/darwin.c \ src/unix/proctitle.c endif +if DRAGONFLY +include_HEADERS += include/uv-bsd.h +libuv_la_SOURCES += src/unix/kqueue.c src/unix/freebsd.c +endif + if FREEBSD include_HEADERS += include/uv-bsd.h libuv_la_SOURCES += src/unix/freebsd.c src/unix/kqueue.c |