Date: Thu, 14 Feb 2013 05:33:04 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312193 - in head/net/vtun: . files Message-ID: <201302140533.r1E5X48s075328@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Feb 14 05:33:03 2013 New Revision: 312193 URL: http://svnweb.freebsd.org/changeset/ports/312193 Log: Fix PR 172204 (failure to build using CLANG). PR: 172204 Added: head/net/vtun/files/extra-cfg_file.y (contents, props changed) Modified: head/net/vtun/Makefile Modified: head/net/vtun/Makefile ============================================================================== --- head/net/vtun/Makefile Thu Feb 14 05:10:09 2013 (r312192) +++ head/net/vtun/Makefile Thu Feb 14 05:33:03 2013 (r312193) @@ -30,9 +30,15 @@ ALL_TARGET= vtund DOCS= ChangeLog Credits FAQ README README.LZO README.Setup \ README.Shaper TODO +.include <bsd.port.pre.mk> + +.if ${CC} == "clang" || ${CXX} == "clang++" || ${OSVERSION} >= 1000026 +EXTRA_PATCHES+= ${FILESDIR}/extra-cfg_file.y +.endif + .if defined(VTUN_EXTENDED_MODE) # Obtained from http://home.jp.FreeBSD.org/~simokawa/vtun-v6.html -EXTRA_PATCHES= ${FILESDIR}/extra-tun_dev.c +EXTRA_PATCHES+= ${FILESDIR}/extra-tun_dev.c .endif post-install: @@ -45,4 +51,4 @@ post-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Added: head/net/vtun/files/extra-cfg_file.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/vtun/files/extra-cfg_file.y Thu Feb 14 05:33:03 2013 (r312193) @@ -0,0 +1,11 @@ +--- cfg_file.y.orig 2012-07-09 09:01:08.000000000 +0800 ++++ cfg_file.y 2013-02-12 11:33:52.000000000 +0800 +@@ -609,7 +609,7 @@ + } + + /* Clear the VTUN_NAT_HACK flag which are not relevant to the current operation mode */ +-inline void clear_nat_hack_flags(int svr) ++void clear_nat_hack_flags(int svr) + { + if (svr) + llist_trav(&host_list,clear_nat_hack_server,NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302140533.r1E5X48s075328>