diff options
| author | otis <otis@pkgsrc.org> | 2020-12-06 17:42:28 +0000 |
|---|---|---|
| committer | otis <otis@pkgsrc.org> | 2020-12-06 17:42:28 +0000 |
| commit | b55bb4ba0381d7ede0b5f51f7f9c0b827fe3eae4 (patch) | |
| tree | a80e5014b65fee92437cd08872a71508ff021650 /net/haproxy | |
| parent | 20c59d284d17321b9d339732d2499321a79a3ba6 (diff) | |
| download | pkgsrc-b55bb4ba0381d7ede0b5f51f7f9c0b827fe3eae4.tar.gz | |
haproxy: Fix build on SmartOS
Fix build on SmartOS by adding proper _XOPEN_SOURCE et al. #define's
Diffstat (limited to 'net/haproxy')
| -rw-r--r-- | net/haproxy/distinfo | 7 | ||||
| -rw-r--r-- | net/haproxy/patches/patch-src_haproxy.c | 7 | ||||
| -rw-r--r-- | net/haproxy/patches/patch-src_proto__sockpair.c | 4 | ||||
| -rw-r--r-- | net/haproxy/patches/patch-src_sock.c | 21 |
4 files changed, 32 insertions, 7 deletions
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index a6444059a55..a65e6deb158 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.62 2020/12/06 11:22:53 adam Exp $ +$NetBSD: distinfo,v 1.63 2020/12/06 17:42:28 otis Exp $ SHA1 (haproxy-2.3.2.tar.gz) = 12de35c18989b92ec27ec560ab51ce40993c601d RMD160 (haproxy-2.3.2.tar.gz) = fb4c5fce40e3e428433a310800e1323fad9c2c49 @@ -6,5 +6,6 @@ SHA512 (haproxy-2.3.2.tar.gz) = ffabf499781220f71fd99d7f66f3a77f310ef69735e5c7e7 Size (haproxy-2.3.2.tar.gz) = 2903983 bytes SHA1 (patch-Makefile) = fcb2de85189526ae42ccf0b789789ee9b834f375 SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5 -SHA1 (patch-src_haproxy.c) = badb172013541087d84f03726ea928c6f5634dc3 -SHA1 (patch-src_proto__sockpair.c) = 1f2a318f3b7c74a191774f8bb3511c23401c10ef +SHA1 (patch-src_haproxy.c) = f0cd9d00f7d970bd3efa751b1584657ed14bcb7d +SHA1 (patch-src_proto__sockpair.c) = 4d389c1f12d060517b8038ada9f0f4b5c87cf519 +SHA1 (patch-src_sock.c) = a27ab68da8f8c26881fd61ce8ffffed2bf251e32 diff --git a/net/haproxy/patches/patch-src_haproxy.c b/net/haproxy/patches/patch-src_haproxy.c index 4429e5fa310..7ee75530d39 100644 --- a/net/haproxy/patches/patch-src_haproxy.c +++ b/net/haproxy/patches/patch-src_haproxy.c @@ -1,10 +1,10 @@ -$NetBSD: patch-src_haproxy.c,v 1.2 2018/07/25 13:51:18 jperkin Exp $ +$NetBSD: patch-src_haproxy.c,v 1.3 2020/12/06 17:42:28 otis Exp $ Special handling for XPG4_2 on SunOS. ---- src/haproxy.c.orig 2018-06-27 14:27:32.000000000 +0000 +--- src/haproxy.c.orig 2020-11-28 15:51:33.000000000 +0000 +++ src/haproxy.c -@@ -26,6 +26,13 @@ +@@ -26,6 +26,14 @@ */ #define _GNU_SOURCE @@ -14,6 +14,7 @@ Special handling for XPG4_2 on SunOS. +# else +#define _XOPEN_SOURCE 600 +# endif ++#define _XOPEN_SOURCE_EXTENDED 1 +#endif #include <stdio.h> #include <stdlib.h> diff --git a/net/haproxy/patches/patch-src_proto__sockpair.c b/net/haproxy/patches/patch-src_proto__sockpair.c index 8013f616eca..59320ed0f1c 100644 --- a/net/haproxy/patches/patch-src_proto__sockpair.c +++ b/net/haproxy/patches/patch-src_proto__sockpair.c @@ -1,4 +1,6 @@ -$NetBSD: patch-src_proto__sockpair.c,v 1.1 2019/08/11 09:09:41 maya Exp $ +$NetBSD: patch-src_proto__sockpair.c,v 1.2 2020/12/06 17:42:28 otis Exp $ + +Special handling for XPG4_2 on SunOS. --- src/proto_sockpair.c.orig 2019-07-23 13:21:26.000000000 +0000 +++ src/proto_sockpair.c diff --git a/net/haproxy/patches/patch-src_sock.c b/net/haproxy/patches/patch-src_sock.c new file mode 100644 index 00000000000..91c445e8dbc --- /dev/null +++ b/net/haproxy/patches/patch-src_sock.c @@ -0,0 +1,21 @@ +$NetBSD: patch-src_sock.c,v 1.1 2020/12/06 17:42:28 otis Exp $ + +Special handling for XPG4_2 on SunOS. + +--- src/sock.c.orig 2020-11-28 15:51:33.000000000 +0000 ++++ src/sock.c +@@ -11,6 +11,14 @@ + */ + + #define _GNU_SOURCE ++#if defined(__sun) && !defined(_XOPEN_SOURCE) ++# if (__STDC_VERSION__-0 < 199901L) ++#define _XOPEN_SOURCE 500 ++# else ++#define _XOPEN_SOURCE 600 ++# endif ++#define _XOPEN_SOURCE_EXTENDED 1 ++#endif + #include <ctype.h> + #include <errno.h> + #include <fcntl.h> |