ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-24 10:33:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/tjic/urbit_with_libuv11_characteristics

Browse Source
This commit is contained in:
Ubuntu 2014-08-25 21:20:30 +00:00
commit 1524495582
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -297,6 +297,8 @@ VERE_OFILES=\
$(V_OFILES) \
$(MAIN_FILE)
LIBUV=outside/libuv_0.11/.libs/libuv.a
LIBRE2=outside/re2/obj/libre2.a
@ -311,7 +313,10 @@ vere: $(BIN)/vere
all: vere
$(LIBUV):
$(LIBUV_MAKEFILE):
cd outside/libuv_0.11 ; sh autogen.sh ; ./configure ; make
$(LIBUV): $(LIBUV_MAKEFILE)
$(MAKE) -C outside/libuv_0.11 all-am
$(LIBRE2):
@ -364,7 +369,7 @@ clean:
$(RM) $(VERE_OFILES) $(BIN)/vere vere.pkg
distclean: clean
$(MAKE) -C outside/libuv_0.11 clean
$(MAKE) -C outside/libuv_0.11 distclean
$(MAKE) -C outside/re2 clean
$(MAKE) -C outside/ed25519 clean
$(MAKE) -C outside/anachronism clean

5
v/ames.c
View File

@ -333,7 +333,10 @@ u2_ames_io_init()
if ( (ret = uv_udp_bind(&sam_u->wax_u, (const struct sockaddr*) & add_u, 0)) != 0 ) {
uL(fprintf(uH, "ames: bind: %s\n",
uv_strerror(ret)));
c3_assert(0);
if (UV_EADDRINUSE == ret){
uL(fprintf(uH, " ...perhaps you've got two copies of vere running?\n"));
}
exit(1);
}
uv_udp_getsockname(&sam_u->wax_u, (struct sockaddr *)&add_u, &add_i);