I'm planning on upgrading MoarVM, nqp, and rakudo at some point in the
next couple weeks, since there have been many improvements on OpenBSD
compatibility on them lately, but MoarVM requires libuv v1.29.1 rather
than v1.24.1 like what's available now. Would anyone be interested in
helping test the upgrade out? I tested on amd64 and have been running a
bot using it, FWIW.
Here's the diff:
? diff
? patches/patch-test_test-getaddrinfo_c
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libuv/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 20 May 2019 04:47:01 -0000 1.10
+++ Makefile 8 Jun 2019 09:24:18 -0000
@@ -4,10 +4,10 @@
COMMENT = multi-platform library for asynchronous I/O
-VER = 1.24.1
-DISTNAME = libuv-v${VER}
-PKGNAME = libuv-${VER}
-CATEGORIES = devel
+VER = 1.29.1
+DISTNAME = libuv-v${VER}
+PKGNAME = libuv-${VER}
+CATEGORIES = devel
SHARED_LIBS = uv 2.0 # 1.0
@@ -20,7 +20,12 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += pthread
-BUILD_DEPENDS = textproc/py-sphinx
+BUILD_DEPENDS = devel/autoconf/2.69 \
+ devel/automake/1.14 \
+ devel/gmake \
+ devel/libtool \
+ devel/metaauto \
+ textproc/py-sphinx
USE_GMAKE = Yes
@@ -29,7 +34,7 @@ CONFIGURE_ENV = cc_cv_cflags__g=no
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.14
-AUTORECONF = sh autogen.sh
+AUTORECONF = sh autogen.sh
post-build:
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} man -C docs
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libuv/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 4 Jan 2019 08:53:54 -0000 1.3
+++ distinfo 8 Jun 2019 09:24:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (libuv-v1.24.1.tar.gz) =
PdPut7ACFLAibaVbOImNP5SB0M90TUL6+Cdx4PGfKwo=
-SIZE (libuv-v1.24.1.tar.gz) = 1195550
+SHA256 (libuv-v1.29.1.tar.gz) =
FIYEPaXMr4bUUaX+k5IMW2Z3CxMtkrbQoV1jY0bKVww=
+SIZE (libuv-v1.29.1.tar.gz) = 1215082
Index: patches/patch-test_test-dlerror_c
===================================================================
RCS file: patches/patch-test_test-dlerror_c
diff -N patches/patch-test_test-dlerror_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_test-dlerror_c 8 Jun 2019 09:24:18 -0000
@@ -0,0 +1,37 @@
+$OpenBSD$
+
+dlopen on OpenBSD depends on the path given either being an absolute
path or a
+path to a library in ldconfig.
+
+Index: test/test-dlerror.c
+--- test/test-dlerror.c.orig
++++ test/test-dlerror.c
+@@ -28,11 +28,9 @@ TEST_IMPL(dlerror) {
+ const char* path = "test/fixtures/load_error.node";
+ const char* dlerror_no_error = "no error";
+ const char* msg;
+- uv_lib_t lib;
++ uv_lib_t lib = { NULL, NULL };
+ int r;
+
+- lib.errmsg = NULL;
+- lib.handle = NULL;
+ msg = uv_dlerror(&lib);
+ ASSERT(msg != NULL);
+ ASSERT(strstr(msg, dlerror_no_error) != NULL);
+@@ -42,13 +40,13 @@ TEST_IMPL(dlerror) {
+
+ msg = uv_dlerror(&lib);
+ ASSERT(msg != NULL);
+- ASSERT(strstr(msg, path) != NULL);
++ ASSERT(strstr(msg, path) == NULL);
+ ASSERT(strstr(msg, dlerror_no_error) == NULL);
+
+ /* Should return the same error twice in a row. */
+ msg = uv_dlerror(&lib);
+ ASSERT(msg != NULL);
+- ASSERT(strstr(msg, path) != NULL);
++ ASSERT(strstr(msg, path) == NULL);
+ ASSERT(strstr(msg, dlerror_no_error) == NULL);
+
+ uv_dlclose(&lib);
Index: patches/patch-test_test-fs_c
===================================================================
RCS file: /cvs/ports/devel/libuv/patches/patch-test_test-fs_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-test_test-fs_c
--- patches/patch-test_test-fs_c 4 Jan 2019 08:53:54 -0000 1.3
+++ patches/patch-test_test-fs_c 8 Jun 2019 09:24:18 -0000
@@ -6,7 +6,7 @@ https://github.com/libuv/libuv/issues/12
Index: test/test-fs.c
--- test/test-fs.c.orig
+++ test/test-fs.c
-@@ -1768,7 +1768,7 @@ TEST_IMPL(fs_realpath) {
+@@ -1803,7 +1803,7 @@ TEST_IMPL(fs_realpath) {
uv_fs_t req;
loop = uv_default_loop();
@@ -15,7 +15,7 @@ Index: test/test-fs.c
ASSERT(0 == uv_run(loop, UV_RUN_DEFAULT));
ASSERT(dummy_cb_count == 1);
ASSERT(req.ptr == NULL);
-@@ -1784,7 +1784,7 @@ TEST_IMPL(fs_realpath) {
+@@ -1819,7 +1819,7 @@ TEST_IMPL(fs_realpath) {
ASSERT(req.result == UV_ENOENT);
uv_fs_req_cleanup(&req);
