ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-01 03:23:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test' of https://github.com/urbit/urbit into test

Browse Source
This commit is contained in:
Ubuntu 2014-08-27 21:59:38 +00:00
commit 86ff25423d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -298,7 +298,18 @@ VERE_OFILES=\
$(V_OFILES) \
$(MAIN_FILE)
# This is a silly hack necessitated by the fact that libuv uses configure
#
# * Making 'all' obviously requires outside/libuv, which requires the libuv Makefile to be created.
# * Making distclean on outside/libuv destroys the makefile.
# * ...so configuring outside/libuv is parodoxically required in order to distclean it!
# * But what if developer types 'make distclean all' ?
# * first target makes libuv Makefile, then destroys it...and second target knows that it was made.
# * ...so second target borks.
# * Solution: make libuv not only depend on its own Makefile, but on a side effect of creating its own makefile.
#
LIBUV_MAKEFILE=outside/libuv_0.11/Makefile
LIBUV_MAKEFILE2=outside/libuv_0.11/config.log
LIBUV=outside/libuv_0.11/.libs/libuv.a
@ -314,10 +325,11 @@ vere: $(BIN)/vere
all: vere
$(LIBUV_MAKEFILE):
cd outside/libuv_0.11 ; sh autogen.sh ; ./configure --disable-dtrace
$(LIBUV): $(LIBUV_MAKEFILE)
$(LIBUV_MAKEFILE) $(LIBUV_MAKEFILE2):
cd outside/libuv_0.11 ; sh autogen.sh ; ./configure --disable-dtrace
$(LIBUV): $(LIBUV_MAKEFILE) $(LIBUV_MAKEFILE2)
$(MAKE) -C outside/libuv_0.11 all-am
$(LIBRE2):

1
v/unix.c
View File

@ -203,7 +203,6 @@ _unix_fs_event_cb(uv_fs_event_t* was_u,
u2_Host.unx_u.sylo[slot].pax_c = strdup(nod_u->pax_c);
#endif
uL(fprintf(uH, "fs: %s in %s\n", pax_c, nod_u->pax_c));
{
while ( nod_u ) {
nod_u->dry = u2_no;