diff --git a/dev-libs/libuv/libuv-1.10.1.recipe b/dev-libs/libuv/libuv-1.10.2.recipe similarity index 87% rename from dev-libs/libuv/libuv-1.10.1.recipe rename to dev-libs/libuv/libuv-1.10.2.recipe index 7dbae4abc..e95356e17 100644 --- a/dev-libs/libuv/libuv-1.10.1.recipe +++ b/dev-libs/libuv/libuv-1.10.2.recipe @@ -3,11 +3,11 @@ DESCRIPTION="libuv is a multi-platform support library with a focus on \ asynchronous I/O. It was primarily developed for use by Node.js, but it's also \ used by Luvit, Julia, pyuv, and others." HOMEPAGE="http://libuv.org/" -COPYRIGHT="2009-2016 Ryan Dahl and others" +COPYRIGHT="2009-2017 Ryan Dahl and others" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/libuv/libuv/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="4b5f71939dd4272ebcfb8e04833e9a273a08b1bf1277d37d14085d7b04b19832" +CHECKSUM_SHA256="2d740a2adea0f1a19058626f55a076ac41a4ac1f95d4e57cae0c8a634a6cd63b" PATCHES="libuv-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -33,6 +33,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" + cmd:awk cmd:autoconf cmd:automake cmd:gcc$secondaryArchSuffix @@ -44,9 +45,6 @@ BUILD_PREREQUIRES=" BUILD() { - export LDFLAGS="-lroot -lnetwork -lbsd" - export CFLAGS="-D_BSD_SOURCE" - ./autogen.sh runConfigure ./configure diff --git a/dev-libs/libuv/patches/libuv-1.10.1.patchset b/dev-libs/libuv/patches/libuv-1.10.2.patchset similarity index 70% rename from dev-libs/libuv/patches/libuv-1.10.1.patchset rename to dev-libs/libuv/patches/libuv-1.10.2.patchset index 61b0fea41..cb3148588 100644 --- a/dev-libs/libuv/patches/libuv-1.10.1.patchset +++ b/dev-libs/libuv/patches/libuv-1.10.2.patchset @@ -1,16 +1,16 @@ -From 9dfdbc6a361c50b363ab544781eb88a59d9ad817 Mon Sep 17 00:00:00 2001 +From 73e0087955f2351fe1380697aa5192a75167451e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sat, 29 Oct 2016 18:18:22 +0200 -Subject: [PATCH] Haiku supporting code +Date: Thu, 12 Jan 2017 10:19:18 +0100 +Subject: [PATCH] Haiku supporting patches --- - configure.ac | 7 +++++++ - include/uv-unix.h | 4 ++++ - src/unix/core.c | 25 ++++++++++++++++++++++++- - 3 files changed, 35 insertions(+), 1 deletion(-) + configure.ac | 7 +++++++ + src/unix/core.c | 32 +++++++++++++++++++++++++++++++- + test/test-fs.c | 3 ++- + 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index d3787c0..63376c4 100644 +index abaf971..b53e4db 100644 --- a/configure.ac +++ b/configure.ac @@ -41,14 +41,17 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -40,44 +40,36 @@ index d3787c0..63376c4 100644 LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv -luser32" ]) +AS_CASE([$host_os],[haiku*], [ -+ LIBS="$LIBS -lroot -lnetwork -lbsd" ++ LIBS="$LIBS -lnetwork" +]) 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/include/uv-unix.h b/include/uv-unix.h -index bca2714..cae33fe 100644 ---- a/include/uv-unix.h -+++ b/include/uv-unix.h -@@ -58,6 +58,10 @@ - # include "uv-bsd.h" - #endif - -+#ifdef __HAIKU__ -+# include "pthread-barrier.h" -+#endif -+ - #ifndef PTHREAD_BARRIER_SERIAL_THREAD - # include "pthread-barrier.h" - #endif diff --git a/src/unix/core.c b/src/unix/core.c -index 6283ed3..580eceb 100644 +index 6283ed3..ef4b53d 100644 --- a/src/unix/core.c +++ b/src/unix/core.c -@@ -55,6 +55,12 @@ +@@ -55,6 +55,19 @@ # endif #endif +#ifdef __HAIKU__ -+#include -+#define FIONCLEX 0x5450 -+#define FIOCLEX 0x5451 ++# include ++# if defined(O_CLOEXEC) ++# define UV__O_CLOEXEC O_CLOEXEC ++# endif ++# if !defined(FIONCLEX) ++# define FIONCLEX 0x5450 ++# endif ++# if !defined(FIOCLEX) ++# define FIOCLEX 0x5451 ++# endif +#endif + #if defined(__DragonFly__) || \ defined(__FreeBSD__) || \ defined(__FreeBSD_kernel__) -@@ -921,7 +927,7 @@ int uv_getrusage(uv_rusage_t* rusage) { +@@ -921,7 +934,7 @@ int uv_getrusage(uv_rusage_t* rusage) { rusage->ru_stime.tv_sec = usage.ru_stime.tv_sec; rusage->ru_stime.tv_usec = usage.ru_stime.tv_usec; @@ -86,7 +78,7 @@ index 6283ed3..580eceb 100644 rusage->ru_maxrss = usage.ru_maxrss; rusage->ru_ixrss = usage.ru_ixrss; rusage->ru_idrss = usage.ru_idrss; -@@ -938,6 +944,23 @@ int uv_getrusage(uv_rusage_t* rusage) { +@@ -938,6 +951,23 @@ int uv_getrusage(uv_rusage_t* rusage) { rusage->ru_nivcsw = usage.ru_nivcsw; #endif @@ -110,20 +102,8 @@ index 6283ed3..580eceb 100644 return 0; } --- -2.10.0 - -From a3834352441da2845c4219af67ea2b610f765a50 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sat, 29 Oct 2016 18:43:04 +0200 -Subject: [PATCH] Test fix - ---- - test/test-fs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - diff --git a/test/test-fs.c b/test/test-fs.c -index 06718f2..b28ad03 100644 +index 70a2399..2c998dc 100644 --- a/test/test-fs.c +++ b/test/test-fs.c @@ -29,7 +29,8 @@ @@ -137,5 +117,5 @@ index 06718f2..b28ad03 100644 #else # include -- -2.10.0 +2.11.0