CVS commit: pkgsrc/devel/tevent

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Feb 23 21:28:33 UTC 2019

Modified Files:
        pkgsrc/devel/tevent: distinfo
Added Files:
        pkgsrc/devel/tevent/patches:
            patch-buildtools_wafsamba_samba__conftests.py patch-wscript

Log Message:
tevent: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/tevent/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__conftests.py \
    pkgsrc/devel/tevent/patches/patch-wscript

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

Modified files:

Index: pkgsrc/devel/tevent/distinfo
diff -u pkgsrc/devel/tevent/distinfo:1.3 pkgsrc/devel/tevent/distinfo:1.4
--- pkgsrc/devel/tevent/distinfo:1.3    Thu Jan 17 21:29:39 2019
+++ pkgsrc/devel/tevent/distinfo        Sat Feb 23 21:28:33 2019
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2019/01/17 21:29:39 adam Exp $
+$NetBSD: distinfo,v 1.4 2019/02/23 21:28:33 jperkin Exp $
 
 SHA1 (tevent-0.9.38.tar.gz) = 89d3948532121ac656485dd81953581647dc6a56
 RMD160 (tevent-0.9.38.tar.gz) = a0f2d418461ae08c9ebf80e56eaa7aecd8a438b9
 SHA512 (tevent-0.9.38.tar.gz) = f475a7b7c261368bd641992c8f657c081bbbe783535ff435a7b68f7749d0e5873d57d05cf6ce80a28ccc9f11033022d28e9ae357b03854109c2c279a003d2035
 Size (tevent-0.9.38.tar.gz) = 794856 bytes
+SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d53847b1006b7a87add2303f170bb5f23d5f738c
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
+SHA1 (patch-wscript) = 34f464296ca3e8eb9b50e1f85f31c38c4c8fdf93

Added files:

Index: pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__conftests.py
diff -u /dev/null pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__conftests.py:1.1
--- /dev/null   Sat Feb 23 21:28:33 2019
+++ pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__conftests.py   Sat Feb 23 21:28:33 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-buildtools_wafsamba_samba__conftests.py,v 1.1 2019/02/23 21:28:33 jperkin Exp $
+
+Ensure defines are strings to avoid assertion failure, some
+returned values are unicode.
+
+--- buildtools/wafsamba/samba_conftests.py.orig        2019-01-14 22:24:44.000000000 +0000
++++ buildtools/wafsamba/samba_conftests.py
+@@ -97,9 +97,9 @@ def CHECK_LARGEFILE(conf, define='HAVE_L
+                 if flag[:2] == "-D":
+                     flag_split = flag[2:].split('=')
+                     if len(flag_split) == 1:
+-                        conf.DEFINE(flag_split[0], '1')
++                        conf.DEFINE(str(flag_split[0]), '1')
+                     else:
+-                        conf.DEFINE(flag_split[0], flag_split[1])
++                        conf.DEFINE(str(flag_split[0]), str(flag_split[1]))
+ 
+     if conf.CHECK_CODE('return !(sizeof(off_t) >= 8)',
+                        define,
Index: pkgsrc/devel/tevent/patches/patch-wscript
diff -u /dev/null pkgsrc/devel/tevent/patches/patch-wscript:1.1
--- /dev/null   Sat Feb 23 21:28:33 2019
+++ pkgsrc/devel/tevent/patches/patch-wscript   Sat Feb 23 21:28:33 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-wscript,v 1.1 2019/02/23 21:28:33 jperkin Exp $
+
+Disable epoll on SunOS.
+
+--- wscript.orig       2019-01-15 10:46:33.000000000 +0000
++++ wscript
+@@ -40,7 +40,7 @@ def configure(conf):
+                 conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
+                 conf.define('USING_SYSTEM_PYTEVENT', 1)
+ 
+-    if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
++    if not sys.platform.startswith('sunos') and conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
+         conf.DEFINE('HAVE_EPOLL', 1)
+ 
+     tevent_num_signals = 64