Merge remote-tracking branch 'upstream/master'

Makefile

@@ -375,8 +375,23 @@ meme: $(BIN)/meme
 $(LIBUV_MAKEFILE) $(LIBUV_MAKEFILE2):
 	cd outside/libuv_0.11 ; sh autogen.sh ; ./configure  --disable-dtrace
 
+# [h]act II: the plot thickens
+#
+#     * Specifying two targets that each configure libuv works
+#       when the rules are executed sequentially,
+#     * but when attempting a parallel build, it is likely Make
+#       will try to configure libuv simultaneously.
+#     * We can specify a dependency between the two targets so
+#       that execution of their rule(s) is serialized.
+#     * Further, libuv does not seem to be friendly towards
+#       parallel builds either. A true fix is out of scope here
+#     * ...so we must instruct Make to only use one job when it
+#       attempts to build libuv.
+#
+$(LIBUV_MAKEFILE2): $(LIBUV_MAKEFILE)
+
 $(LIBUV): $(LIBUV_MAKEFILE) $(LIBUV_MAKEFILE2)
-	$(MAKE) -C outside/libuv_0.11 all-am
+	$(MAKE) -C outside/libuv_0.11 all-am -j1
 
 $(LIBRE2):
 	$(MAKE) -C outside/re2 obj/libre2.a
@@ -441,6 +456,8 @@ debinstall:
 clean:
 	$(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES)
 
+# 'make distclean all -jn' ∀ n>1 still does not work because it is possible
+# Make will attempt to build urbit while it is also cleaning urbit..
 distclean: clean $(LIBUV_MAKEFILE)
 	$(MAKE) -C outside/libuv_0.11 distclean
 	$(MAKE) -C outside/re2 clean

debian/control

@@ -2,7 +2,7 @@ Source: urbit
 Section: unknown
 Priority: extra
 Maintainer: Urbit <urbit@urbit.org>
-Build-Depends: debhelper (>= 8.0.0), libssl-dev, libncurses5-dev, libgmp-dev, libsigsegv-dev, ragel
+Build-Depends: debhelper (>= 8.0.0), libssl-dev, libncurses5-dev, libgmp-dev, libsigsegv-dev, ragel, cmake
 Standards-Version: 3.9.3
 Homepage: http://urbit.org/