CVS commit: pkgsrc/net/py-pynng

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Thu May 13 19:35:54 UTC 2021

Modified Files:
        pkgsrc/net/py-pynng: Makefile distinfo
Added Files:
        pkgsrc/net/py-pynng/patches: patch-build__pynng.py
            patch-mbedtls_library_net__sockets.c
            patch-nng_src_platform_posix_posix__thread.c patch-setup.py

Log Message:
py-pynng: fix build on NetBSD

Needs a PKGREVISION bump as missing dependencies were registered as well.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-pynng/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-pynng/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/py-pynng/patches/patch-build__pynng.py \
    pkgsrc/net/py-pynng/patches/patch-mbedtls_library_net__sockets.c \
    pkgsrc/net/py-pynng/patches/patch-nng_src_platform_posix_posix__thread.c \
    pkgsrc/net/py-pynng/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-pynng/Makefile
diff -u pkgsrc/net/py-pynng/Makefile:1.2 pkgsrc/net/py-pynng/Makefile:1.3
--- pkgsrc/net/py-pynng/Makefile:1.2    Tue May 11 21:06:15 2021
+++ pkgsrc/net/py-pynng/Makefile        Thu May 13 19:35:54 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2021/05/11 21:06:15 khorben Exp $
+# $NetBSD: Makefile,v 1.3 2021/05/13 19:35:54 khorben Exp $
 
 DISTNAME=      pynng-0.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pynng/}
 
@@ -10,7 +11,13 @@ HOMEPAGE=    https://github.com/codypiersal
 COMMENT=       Ergonomic bindings for nanomsg next generation (nng) in Python
 LICENSE=       mit
 
+USE_TOOLS+=    cmake
+
+DEPENDS+=      ${PYPKGPREFIX}-sniffio-[0-9]*:../../misc/py-sniffio
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/egg.mk"
+.include "../../mk/atomic64.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-pynng/distinfo
diff -u pkgsrc/net/py-pynng/distinfo:1.1 pkgsrc/net/py-pynng/distinfo:1.2
--- pkgsrc/net/py-pynng/distinfo:1.1    Tue May 11 08:56:00 2021
+++ pkgsrc/net/py-pynng/distinfo        Thu May 13 19:35:54 2021
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.1 2021/05/11 08:56:00 khorben Exp $
+$NetBSD: distinfo,v 1.2 2021/05/13 19:35:54 khorben Exp $
 
 SHA1 (pynng-0.7.1.tar.gz) = 306806f168cc064f830e064b2b748550cb726bf9
 RMD160 (pynng-0.7.1.tar.gz) = 79f7e542b2cf2db0c9b93ce67fe3d979a58f55a6
 SHA512 (pynng-0.7.1.tar.gz) = 72fc89902474dee6b2ae31cf8e572cd15deead170d8eacba73716b0df0ae3a24611fc1be9d098910cbe4a47dfff1e4a5f98cf8aeca946c469d80a2ae24c35b5f
 Size (pynng-0.7.1.tar.gz) = 3815296 bytes
+SHA1 (patch-build__pynng.py) = 9cb7216c90eb795934747272e0a9cf35d01aefee
+SHA1 (patch-mbedtls_library_net__sockets.c) = d4edd8bb86b78254994f7505abd6155ccdd947ce
+SHA1 (patch-nng_src_platform_posix_posix__thread.c) = e7df7ed999a4f9c9681f1456094a1e8dbff04547
+SHA1 (patch-setup.py) = c4dc8905bd304527b75ce53b39b70025be208714

Added files:

Index: pkgsrc/net/py-pynng/patches/patch-build__pynng.py
diff -u /dev/null pkgsrc/net/py-pynng/patches/patch-build__pynng.py:1.1
--- /dev/null   Thu May 13 19:35:54 2021
+++ pkgsrc/net/py-pynng/patches/patch-build__pynng.py   Thu May 13 19:35:54 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-build__pynng.py,v 1.1 2021/05/13 19:35:54 khorben Exp $
+
+Fix build on NetBSD
+
+--- build_pynng.py.orig        2020-12-17 03:54:43.000000000 +0000
++++ build_pynng.py
+@@ -28,8 +28,8 @@ else:
+     machine = os.uname().machine
+     # this is a pretty heuristic... but let's go with it anyway.
+     # it would be better to get linker information from cmake somehow.
+-    if not ('x86' in machine or 'i386' in machine or 'i686' in machine):
+-        libraries.append('atomic')
++    #if not ('x86' in machine or 'i386' in machine or 'i686' in machine):
++    #    libraries.append('atomic')
+ 
+ 
+ ffibuilder.set_source(
Index: pkgsrc/net/py-pynng/patches/patch-mbedtls_library_net__sockets.c
diff -u /dev/null pkgsrc/net/py-pynng/patches/patch-mbedtls_library_net__sockets.c:1.1
--- /dev/null   Thu May 13 19:35:54 2021
+++ pkgsrc/net/py-pynng/patches/patch-mbedtls_library_net__sockets.c    Thu May 13 19:35:54 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-mbedtls_library_net__sockets.c,v 1.1 2021/05/13 19:35:54 khorben Exp $
+
+Fix build on NetBSD
+
+--- mbedtls/library/net_sockets.c.orig 2020-08-27 02:34:52.000000000 +0000
++++ mbedtls/library/net_sockets.c
+@@ -24,6 +24,10 @@
+  * Harmless on other platforms. */
+ #define _POSIX_C_SOURCE 200112L
+ 
++#if defined(__NetBSD__)
++# define _NETBSD_SOURCE
++#endif
++
+ #if !defined(MBEDTLS_CONFIG_FILE)
+ #include "mbedtls/config.h"
+ #else
Index: pkgsrc/net/py-pynng/patches/patch-nng_src_platform_posix_posix__thread.c
diff -u /dev/null pkgsrc/net/py-pynng/patches/patch-nng_src_platform_posix_posix__thread.c:1.1
--- /dev/null   Thu May 13 19:35:54 2021
+++ pkgsrc/net/py-pynng/patches/patch-nng_src_platform_posix_posix__thread.c    Thu May 13 19:35:54 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-nng_src_platform_posix_posix__thread.c,v 1.1 2021/05/13 19:35:54 khorben Exp $
+
+Fix build on NetBSD
+
+--- nng/src/platform/posix/posix_thread.c.orig 2020-08-27 02:35:02.000000000 +0000
++++ nng/src/platform/posix/posix_thread.c
+@@ -268,6 +268,12 @@ nni_plat_thr_set_name(nni_plat_thr *thr,
+       if ((thr == NULL) || (pthread_self() == thr->tid)) {
+               pthread_setname_np(name);
+       }
++#elif defined(__NetBSD__)
++      if (thr == NULL) {
++              pthread_setname_np(pthread_self(), "%s", name);
++      } else {
++              pthread_setname_np(thr->tid, "%s", name);
++      }
+ #else
+       if (thr == NULL) {
+                 pthread_setname_np(pthread_self(), name);
Index: pkgsrc/net/py-pynng/patches/patch-setup.py
diff -u /dev/null pkgsrc/net/py-pynng/patches/patch-setup.py:1.1
--- /dev/null   Thu May 13 19:35:54 2021
+++ pkgsrc/net/py-pynng/patches/patch-setup.py  Thu May 13 19:35:54 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2021/05/13 19:35:54 khorben Exp $
+
+Fix build on NetBSD
+
+--- setup.py.orig      2021-03-27 21:43:27.000000000 +0000
++++ setup.py
+@@ -44,6 +44,7 @@ def build_mbedtls(cmake_args):
+     cmake_cmd = ['cmake'] + cmake_args
+     cmake_cmd += [
+         '-DENABLE_PROGRAMS=OFF',
++        '-DENABLE_TESTING=OFF',
+         '-DCMAKE_BUILD_TYPE=Release',
+         '-DCMAKE_INSTALL_PREFIX=../prefix',
+         '..'