diff options
| author | sevan <sevan@pkgsrc.org> | 2019-07-08 22:15:46 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2019-07-08 22:15:46 +0000 |
| commit | 8ae203bffe28a83eb3ae1ea9881b59b99a1adf5e (patch) | |
| tree | 250c54d01ccedd977fdfc11275f5467067fffabe /devel | |
| parent | c9829939700765c6703dc91217ea7b619f5e96e5 (diff) | |
| download | pkgsrc-8ae203bffe28a83eb3ae1ea9881b59b99a1adf5e.tar.gz | |
Obtain strnlen implementation via libnbcompat using USE_FEATURES, instead of
patching in an implementation.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libuv/Makefile | 3 | ||||
| -rw-r--r-- | devel/libuv/patches/patch-src_unix_darwin.c | 22 |
2 files changed, 2 insertions, 23 deletions
diff --git a/devel/libuv/Makefile b/devel/libuv/Makefile index 14462b07bc3..1300d9b033d 100644 --- a/devel/libuv/Makefile +++ b/devel/libuv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2019/07/02 16:44:06 adam Exp $ +# $NetBSD: Makefile,v 1.52 2019/07/08 22:15:46 sevan Exp $ DISTNAME= libuv-1.30.1 CATEGORIES= devel @@ -12,6 +12,7 @@ LICENSE= mit AND 2-clause-bsd AND isc AND modified-bsd USE_LIBTOOL= yes USE_TOOLS+= autoconf automake pkg-config +USE_FEATURES+= strnlen GNU_CONFIGURE= yes TEST_TARGET= check diff --git a/devel/libuv/patches/patch-src_unix_darwin.c b/devel/libuv/patches/patch-src_unix_darwin.c deleted file mode 100644 index e797770d4ac..00000000000 --- a/devel/libuv/patches/patch-src_unix_darwin.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_unix_darwin.c,v 1.1 2017/12/11 13:32:12 jperkin Exp $ - -Provide compat strnlen for older Darwin. - ---- src/unix/darwin.c.orig 2017-12-01 02:07:38.000000000 +0000 -+++ src/unix/darwin.c -@@ -229,3 +229,15 @@ void uv_free_cpu_info(uv_cpu_info_t* cpu - - uv__free(cpu_infos); - } -+ -+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1070 -+size_t strnlen(const char* s, size_t maxlen) { -+ size_t len; -+ -+ for (len = 0; len < maxlen; len++, s++) { -+ if (!*s) -+ break; -+ } -+ return (len); -+} -+#endif |