diff options
| author | rakuco <rakuco@FreeBSD.org> | 2016-03-04 01:17:52 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2016-03-04 01:17:52 +0800 |
| commit | 3873b97b7e7880393212d5cb4bed24ea53bb0704 (patch) | |
| tree | 75c7851d5e3e162e85cbc307a458384da15cb72a /x11-servers | |
| parent | 4d975b1957484fde0c00d351fb7d930c946ff6a2 (diff) | |
| download | freebsd-ports-gnome-3873b97b7e7880393212d5cb4bed24ea53bb0704.tar.gz freebsd-ports-gnome-3873b97b7e7880393212d5cb4bed24ea53bb0704.tar.zst freebsd-ports-gnome-3873b97b7e7880393212d5cb4bed24ea53bb0704.zip | |
Fix build with clang 3.8.0.
During a recent exp-run for bug 206074, it was found that x11-servers/x11rdp
gives errors with clang 3.8.0:
/wrkdirs/usr/ports/x11-servers/x11rdp/work/x11rdp_xorg71/build_dir/include/X11/Xtrans/Xtranssock.c:1027:50: error: reference to 'in6addr_any' is ambiguous
((struct sockaddr_in6 *)&sockname)->sin6_addr = in6addr_any;
^
This is because Xtranssock.c attempts to redefine in6addr_any as a weak symbol,
which does not work with clang 3.8.0. As a fix, place the customized
in6addr_any definition between #ifdef __FreeBSD__ guards.
PR: 207192
Submitted by: dim
Reviewed by: Koichiro IWAO <meta+ports@vmeta.jp> (maintainer)
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/x11rdp/files/patch-xtrans-X11R7.0-1.0.0__Xtranssock.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/x11-servers/x11rdp/files/patch-xtrans-X11R7.0-1.0.0__Xtranssock.c b/x11-servers/x11rdp/files/patch-xtrans-X11R7.0-1.0.0__Xtranssock.c new file mode 100644 index 000000000000..da9d3c8b48e9 --- /dev/null +++ b/x11-servers/x11rdp/files/patch-xtrans-X11R7.0-1.0.0__Xtranssock.c @@ -0,0 +1,16 @@ +--- xtrans-X11R7.0-1.0.0/Xtranssock.c.orig 2013-01-28 17:29:24.000000000 +0100 ++++ xtrans-X11R7.0-1.0.0/Xtranssock.c 2016-02-14 17:33:06.948806000 +0100 +@@ -286,11 +286,13 @@ static int TRANS(SocketINETClose) (Xtran + * that don't have IPv6 support. + */ + #if defined(IPv6) && defined(AF_INET6) ++#ifndef __FreeBSD__ + static const struct in6_addr local_in6addr_any = IN6ADDR_ANY_INIT; + #pragma weak in6addr_any = local_in6addr_any + #ifndef __USLC__ + #pragma weak getaddrinfo + #endif ++#endif + static int haveIPv6 = 1; + #endif + |