1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: upgrade libuv to 47b2cd3

Browse Source
This commit is contained in:
Ben Noordhuis 2012-10-11 14:36:23 +02:00
parent 4eb5399bb2
commit d7c45ea7d0
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/uv/Makefile vendored
View File

@ -35,15 +35,15 @@ endif
TESTS=test/blackhole-server.c test/echo-server.c test/test-*.c TESTS=test/blackhole-server.c test/echo-server.c test/test-*.c
BENCHMARKS=test/blackhole-server.c test/echo-server.c test/dns-server.c test/benchmark-*.c BENCHMARKS=test/blackhole-server.c test/echo-server.c test/dns-server.c test/benchmark-*.c
all: uv.a all: libuv.a
test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) libuv.a
$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-tests test/run-tests.c \ $(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-tests test/run-tests.c \
test/runner.c $(RUNNER_SRC) $(TESTS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS) test/runner.c $(RUNNER_SRC) $(TESTS) libuv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.a
$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-benchmarks test/run-benchmarks.c \ $(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-benchmarks test/run-benchmarks.c \
test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS) test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
test/echo.o: test/echo.c test/echo.h test/echo.o: test/echo.c test/echo.h
$(CC) $(CPPFLAGS) $(CFLAGS) -c test/echo.c -o test/echo.o $(CC) $(CPPFLAGS) $(CFLAGS) -c test/echo.c -o test/echo.o

4
deps/uv/config-mingw.mk vendored
View File

@ -35,8 +35,8 @@ RUNNER_LINKFLAGS=$(LINKFLAGS)
RUNNER_LIBS=-lws2_32 -lpsapi -liphlpapi RUNNER_LIBS=-lws2_32 -lpsapi -liphlpapi
RUNNER_SRC=test/runner-win.c RUNNER_SRC=test/runner-win.c
uv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o libuv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o
$(AR) rcs uv.a $^ $(AR) rcs $@ $^
src/%.o: src/%.c include/uv.h include/uv-private/uv-win.h src/%.o: src/%.c include/uv.h include/uv-private/uv-win.h
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@

4
deps/uv/config-unix.mk vendored
View File

@ -128,8 +128,8 @@ endif
RUNNER_LIBS= RUNNER_LIBS=
RUNNER_SRC=test/runner-unix.c RUNNER_SRC=test/runner-unix.c
uv.a: $(OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/unix/ev/ev.o libuv.a: $(OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/unix/ev/ev.o
$(AR) rcs uv.a $^ $(AR) rcs $@ $^
src/%.o: src/%.c include/uv.h include/uv-private/uv-unix.h src/%.o: src/%.c include/uv.h include/uv-private/uv-unix.h
$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ $(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c $< -o $@

6
deps/uv/uv.gyp vendored
View File

@ -22,7 +22,7 @@
'targets': [ 'targets': [
{ {
'target_name': 'uv', 'target_name': 'libuv',
'type': '<(library)', 'type': '<(library)',
'include_dirs': [ 'include_dirs': [
'include', 'include',
@ -236,7 +236,7 @@
{ {
'target_name': 'run-tests', 'target_name': 'run-tests',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'uv' ], 'dependencies': [ 'libuv' ],
'sources': [ 'sources': [
'test/blackhole-server.c', 'test/blackhole-server.c',
'test/echo-server.c', 'test/echo-server.c',
@ -357,7 +357,7 @@
{ {
'target_name': 'run-benchmarks', 'target_name': 'run-benchmarks',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'uv' ], 'dependencies': [ 'libuv' ],
'sources': [ 'sources': [
'test/benchmark-async.c', 'test/benchmark-async.c',
'test/benchmark-async-pummel.c', 'test/benchmark-async-pummel.c',

2
node.gyp
View File

@ -59,7 +59,7 @@
'dependencies': [ 'dependencies': [
'deps/cares/cares.gyp:cares', 'deps/cares/cares.gyp:cares',
'deps/http_parser/http_parser.gyp:http_parser', 'deps/http_parser/http_parser.gyp:http_parser',
'deps/uv/uv.gyp:uv', 'deps/uv/uv.gyp:libuv',
'node_js2c#host', 'node_js2c#host',
], ],