From 33d0bec0ac958239eee11da6580157369537eda5 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 May 2016 02:40:55 +0300 Subject: update libuv to 1.9.1 The patches are not needed: * https://github.com/libuv/libuv/issues/820 * https://github.com/libuv/libuv/pull/841/ --- src/libuv-1-fixes.patch | 79 ------------------------------------------------- src/libuv.mk | 4 +-- 2 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 src/libuv-1-fixes.patch diff --git a/src/libuv-1-fixes.patch b/src/libuv-1-fixes.patch deleted file mode 100644 index ec8f957..0000000 --- a/src/libuv-1-fixes.patch +++ /dev/null @@ -1,79 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: cjihrig -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é -Reviewed-By: Ben Noordhuis - -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 -Date: Tue, 12 Apr 2016 11:06:36 +1000 -Subject: [PATCH] set LIBS in configure.ac instead of Makefile.am - - -diff --git a/Makefile.am b/Makefile.am -index 1111111..2222222 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -45,7 +45,6 @@ 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 \ - src/win/atomicops-inl.h \ - src/win/core.c \ -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,9 @@ AM_CONDITIONAL([NETBSD], [AS_CASE([$host_os],[netbsd*], [true], [false]) - AM_CONDITIONAL([OPENBSD], [AS_CASE([$host_os],[openbsd*], [true], [false])]) - AM_CONDITIONAL([SUNOS], [AS_CASE([$host_os],[solaris*], [true], [false])]) - AM_CONDITIONAL([WINNT], [AS_CASE([$host_os],[mingw*], [true], [false])]) -+AS_CASE([$host_os],[mingw*], [ -+ LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv" -+]) - AC_CHECK_HEADERS([sys/ahafs_evProds.h]) - AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes) - AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "x"]) diff --git a/src/libuv.mk b/src/libuv.mk index 3db9649..9ad02de 100644 --- a/src/libuv.mk +++ b/src/libuv.mk @@ -3,8 +3,8 @@ PKG := libuv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9.0 -$(PKG)_CHECKSUM := d595b2725abcce851c76239aab038adc126c58714cfb572b2ebb2d21b3593842 +$(PKG)_VERSION := 1.9.1 +$(PKG)_CHECKSUM := e83953782c916d7822ef0b94e8115ce5756fab5300cca173f0de5f5b0e0ae928 $(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) -- cgit v0.12