diff options
| author | maya <maya@pkgsrc.org> | 2017-09-22 02:58:50 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-09-22 02:58:50 +0000 |
| commit | 01ee8c17944628941be45ae9cb5db9579da5242c (patch) | |
| tree | 8316886f1bcb6f14dc5c22b4bfe337cab7431f6b /devel | |
| parent | 03ae940baaecf92d8e4de598ef50ee586c5ffb88 (diff) | |
| download | pkgsrc-01ee8c17944628941be45ae9cb5db9579da5242c.tar.gz | |
libevent: remove redundant include, define __EXT_POSIX2 on QNX.
Should help QNX build the package, but still missing a fallback definition
for SA_RESTART.
Reported by Jan Danielsson on pkgsrc-users.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libevent/Makefile | 3 | ||||
| -rw-r--r-- | devel/libevent/distinfo | 5 | ||||
| -rw-r--r-- | devel/libevent/patches/patch-evutil__rand.c | 7 | ||||
| -rw-r--r-- | devel/libevent/patches/patch-test_bench__cascade.c | 14 |
4 files changed, 23 insertions, 6 deletions
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile index a4520d374dc..b7a335f546a 100644 --- a/devel/libevent/Makefile +++ b/devel/libevent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2017/02/15 17:34:37 adam Exp $ +# $NetBSD: Makefile,v 1.52 2017/09/22 02:58:50 maya Exp $ .include "../../devel/libevent/Makefile.common" @@ -18,6 +18,7 @@ TEST_TARGET= verify LIBS.SunOS+= -lnsl -lresolv CPPFLAGS.SunOS+= -D__EXTENSIONS__ +CPPFLAGS.QNX+= -D__EXT_POSIX2 # XXX helps build, but needs more testing #CFLAGS.Interix+= -Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32 diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo index 624eca7aab4..23a6107cbc2 100644 --- a/devel/libevent/distinfo +++ b/devel/libevent/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.34 2017/03/08 13:37:55 jperkin Exp $ +$NetBSD: distinfo,v 1.35 2017/09/22 02:58:50 maya Exp $ SHA1 (libevent-2.1.8-stable.tar.gz) = 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec RMD160 (libevent-2.1.8-stable.tar.gz) = 6c7ce8cb51279f9b6b8d8897192db6a2da3d6797 SHA512 (libevent-2.1.8-stable.tar.gz) = a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 Size (libevent-2.1.8-stable.tar.gz) = 1026485 bytes SHA1 (patch-Makefile.in) = 09c7524eb8657e1f76232db97273806a8c900219 -SHA1 (patch-evutil__rand.c) = 92af79099f2344cbda7ce4d23e10835df583999b +SHA1 (patch-evutil__rand.c) = 2b51e719d25181e03b5afb7df0bf443f1d62a8f1 +SHA1 (patch-test_bench__cascade.c) = 58bd32fe0cddc468fda57386283b5298b28ef93e diff --git a/devel/libevent/patches/patch-evutil__rand.c b/devel/libevent/patches/patch-evutil__rand.c index b375ee6d85f..908de2be46e 100644 --- a/devel/libevent/patches/patch-evutil__rand.c +++ b/devel/libevent/patches/patch-evutil__rand.c @@ -1,11 +1,11 @@ -$NetBSD: patch-evutil__rand.c,v 1.3 2017/03/08 13:37:55 jperkin Exp $ +$NetBSD: patch-evutil__rand.c,v 1.4 2017/09/22 02:58:50 maya Exp $ Native illumos arc4random(3C) imported the latest OpenBSD API which does not have arc4random_addrandom(). ---- evutil_rand.c.orig 2013-11-01 18:18:57.000000000 +0000 +--- evutil_rand.c.orig 2016-10-04 19:55:31.000000000 +0000 +++ evutil_rand.c -@@ -195,7 +195,9 @@ evutil_secure_rng_get_bytes(void *buf, s +@@ -195,8 +195,10 @@ evutil_secure_rng_get_bytes(void *buf, s void evutil_secure_rng_add_bytes(const char *buf, size_t n) { @@ -15,3 +15,4 @@ does not have arc4random_addrandom(). +#endif } + void diff --git a/devel/libevent/patches/patch-test_bench__cascade.c b/devel/libevent/patches/patch-test_bench__cascade.c new file mode 100644 index 00000000000..aa0231318d3 --- /dev/null +++ b/devel/libevent/patches/patch-test_bench__cascade.c @@ -0,0 +1,14 @@ +$NetBSD: patch-test_bench__cascade.c,v 1.1 2017/09/22 02:58:50 maya Exp $ + +Remove redundant include (absent in QNX 6.5) + +--- test/bench_cascade.c.orig 2016-10-04 19:55:31.000000000 +0000 ++++ test/bench_cascade.c +@@ -48,7 +48,6 @@ + #include <unistd.h> + #endif + #include <errno.h> +-#include <getopt.h> + #include <event.h> + #include <evutil.h> + |