Date: Thu, 3 Mar 2016 17:17:52 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410064 - head/x11-servers/x11rdp/files Message-ID: <201603031717.u23HHqin003106@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Thu Mar 3 17:17:52 2016 New Revision: 410064 URL: https://svnweb.freebsd.org/changeset/ports/410064 Log: 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) Added: head/x11-servers/x11rdp/files/patch-xtrans-X11R7.0-1.0.0__Xtranssock.c (contents, props changed) Added: head/x11-servers/x11rdp/files/patch-xtrans-X11R7.0-1.0.0__Xtranssock.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/x11rdp/files/patch-xtrans-X11R7.0-1.0.0__Xtranssock.c Thu Mar 3 17:17:52 2016 (r410064) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603031717.u23HHqin003106>