Received: by mail.netbsd.org (Postfix, from userid 605) id E20AC84F49; Sat, 23 Feb 2019 21:28:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6ABDA84DB5 for ; Sat, 23 Feb 2019 21:28:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 1b7J99neJj7q for ; Sat, 23 Feb 2019 21:28:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D177A84C82 for ; Sat, 23 Feb 2019 21:28:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CB75AFB16; Sat, 23 Feb 2019 21:28:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155095731398230" MIME-Version: 1.0 Date: Sat, 23 Feb 2019 21:28:33 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/devel/tevent To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20190223212833.CB75AFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_155095731398230 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_155095731398230 Content-Disposition: inline Content-Length: 3090 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_155095731398230--