Merge remote-tracking branch 'origin/v0.10'

build.mk

@@ -18,7 +18,11 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
+ifdef PLATFORM
+override PLATFORM := $(shell echo $(PLATFORM) | tr "[A-Z]" "[a-z]")
+else
+PLATFORM = $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
+endif
 
 CPPFLAGS += -I$(SRCDIR)/include -I$(SRCDIR)/include/uv-private
 

config-unix.mk

@@ -144,6 +144,11 @@ CPPFLAGS += -Isrc/unix
 CFLAGS += -DHAVE_DTRACE
 endif
 
+ifneq (darwin,$(PLATFORM))
+# Must correspond with UV_VERSION_MAJOR and UV_VERSION_MINOR in src/version.c
+LDFLAGS += -Wl,-soname,libuv.so.0.11
+endif
+
 libuv.a: $(OBJS)
 	$(AR) rcs $@ $^
 

src/version.c

@@ -24,7 +24,9 @@
  /*
  * Versions with an even minor version (e.g. 0.6.1 or 1.0.4) are API and ABI
  * stable. When the minor version is odd, the API can change between patch
- * releases.
+ * releases. Make sure you update the -soname directives in config-unix.mk
+ * and uv.gyp whenever you bump UV_VERSION_MAJOR or UV_VERSION_MINOR (but
+ * not UV_VERSION_PATCH.)
  */
 
 #define UV_VERSION_MAJOR 0

test/test-process-title.c

@@ -43,7 +43,7 @@ static void set_title(const char* title) {
 
 TEST_IMPL(process_title) {
   /* Check for format string vulnerabilities. */
-  set_title("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s");
+  set_title("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s");
   set_title("new title");
   return 0;
 }

test/test-tty.c

@@ -30,6 +30,9 @@
 # include <unistd.h>
 #endif
 
+#include <string.h>
+#include <errno.h>
+
 
 TEST_IMPL(tty) {
   int r, width, height;
@@ -62,7 +65,12 @@ TEST_IMPL(tty) {
 
 #else /* unix */
   ttyin_fd = open("/dev/tty", O_RDONLY, 0);
+  if (ttyin_fd < 0)
+    LOGF("Cannot open /dev/tty as read-only: %s\n", strerror(errno));
+
   ttyout_fd = open("/dev/tty", O_WRONLY, 0);
+  if (ttyout_fd < 0)
+    LOGF("Cannot open /dev/tty as write-only: %s\n", strerror(errno));
 #endif
 
   ASSERT(ttyin_fd >= 0);

uv.gyp

@@ -165,9 +165,16 @@
             ],
           },
           'conditions': [
-            ['"<(library)" == "shared_library"', {
+            ['library=="shared_library"', {
               'cflags': [ '-fPIC' ],
             }],
+            ['library=="shared_library" and OS!="mac"', {
+              'link_settings': {
+                # Must correspond with UV_VERSION_MAJOR and UV_VERSION_MINOR
+                # in src/version.c
+                'libraries': [ '-Wl,-soname,libuv.so.0.11' ],
+              },
+            }],
           ],
         }],
         [ 'OS=="linux" or OS=="mac"', {