diff options
author | jperkin <jperkin@pkgsrc.org> | 2019-02-23 21:28:33 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2019-02-23 21:28:33 +0000 |
commit | cb8f486925625c107bb663ec0bc3c989c8350420 (patch) | |
tree | d2ecc3a2abb4a009d56c8e70d2a8e70170964f7b | |
parent | cefde8e23994e6033593228f221e501e0884e97f (diff) | |
download | pkgsrc-cb8f486925625c107bb663ec0bc3c989c8350420.tar.gz |
tevent: Fix build on SunOS.
-rw-r--r-- | devel/tevent/distinfo | 4 | ||||
-rw-r--r-- | devel/tevent/patches/patch-buildtools_wafsamba_samba__conftests.py | 19 | ||||
-rw-r--r-- | devel/tevent/patches/patch-wscript | 15 |
3 files changed, 37 insertions, 1 deletions
diff --git a/devel/tevent/distinfo b/devel/tevent/distinfo index 9b55031f6b6..7ad1af22a86 100644 --- a/devel/tevent/distinfo +++ b/devel/tevent/distinfo @@ -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 diff --git a/devel/tevent/patches/patch-buildtools_wafsamba_samba__conftests.py b/devel/tevent/patches/patch-buildtools_wafsamba_samba__conftests.py new file mode 100644 index 00000000000..bd0ef8411d8 --- /dev/null +++ b/devel/tevent/patches/patch-buildtools_wafsamba_samba__conftests.py @@ -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, diff --git a/devel/tevent/patches/patch-wscript b/devel/tevent/patches/patch-wscript new file mode 100644 index 00000000000..b843c83a7ec --- /dev/null +++ b/devel/tevent/patches/patch-wscript @@ -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 |