diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-04-24 23:53:38 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-04-24 23:53:38 (GMT) |
| commit | 6d948f77650f4984b6f0037862b22bc7505a8893 (patch) | |
| tree | fa31100bf32b2dc86a160579e292a69b1aade65c /src | |
| parent | 5f76add844a77fcf4052c1a76cc1a1ff887b98fa (diff) | |
| download | mxe-6d948f77650f4984b6f0037862b22bc7505a8893.zip mxe-6d948f77650f4984b6f0037862b22bc7505a8893.tar.gz mxe-6d948f77650f4984b6f0037862b22bc7505a8893.tar.bz2 | |
update libuv to 1.9.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/libuv-1-fixes.patch | 42 | ||||
| -rw-r--r-- | src/libuv.mk | 4 |
2 files changed, 44 insertions, 2 deletions
diff --git a/src/libuv-1-fixes.patch b/src/libuv-1-fixes.patch index 6a5a197..ec8f957 100644 --- a/src/libuv-1-fixes.patch +++ b/src/libuv-1-fixes.patch @@ -4,6 +4,48 @@ See index.html for further information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: cjihrig <cjihrig@gmail.com> +Date: Mon, 11 Apr 2016 11:11:47 -0400 +Subject: [PATCH] Revert "win,build: remove unused build defines" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 60db5b5a1bb446e4b8a6d15ce277d5f7987bf07a. +Removing the WIN32_LEAN_AND_MEAN definition caused build errors +on mingw64. + +Fixes: https://github.com/libuv/libuv/issues/820 +PR-URL: https://github.com/libuv/libuv/pull/821 +Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com> +Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> + +diff --git a/Makefile.am b/Makefile.am +index 1111111..2222222 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -43,6 +43,7 @@ if WINNT + + include_HEADERS += include/uv-win.h include/tree.h + AM_CPPFLAGS += -I$(top_srcdir)/src/win \ ++ -DWIN32_LEAN_AND_MEAN \ + -D_WIN32_WINNT=0x0600 + LIBS += -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv + libuv_la_SOURCES += src/win/async.c \ +diff --git a/Makefile.mingw b/Makefile.mingw +index 1111111..2222222 100644 +--- a/Makefile.mingw ++++ b/Makefile.mingw +@@ -20,6 +20,7 @@ CFLAGS += -Wall \ + -Iinclude \ + -Isrc \ + -Isrc/win \ ++ -DWIN32_LEAN_AND_MEAN \ + -D_WIN32_WINNT=0x0600 + + INCLUDES = include/stdint-msvc2008.h \ + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Tue, 12 Apr 2016 11:06:36 +1000 Subject: [PATCH] set LIBS in configure.ac instead of Makefile.am diff --git a/src/libuv.mk b/src/libuv.mk index 5dd70a2..3db9649 100644 --- a/src/libuv.mk +++ b/src/libuv.mk @@ -3,8 +3,8 @@ PKG := libuv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.0 -$(PKG)_CHECKSUM := 6511f734da4fe082dacf85967606d600b7bce557bb9b2f0d2539193535323125 +$(PKG)_VERSION := 1.9.0 +$(PKG)_CHECKSUM := d595b2725abcce851c76239aab038adc126c58714cfb572b2ebb2d21b3593842 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://dist.libuv.org/dist/v$($(PKG)_VERSION)/$($(PKG)_FILE) |