mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

Fix PR 172204 (failure to build using CLANG).

Browse Source 
PR:		172204
This commit is contained in:
Cy Schubert 2013-02-14 05:33:03 +00:00
parent 109293b9e2
commit d4759664a5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=312193
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/vtun/Makefile
View File

@ -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>

11
net/vtun/files/extra-cfg_file.y Normal file
View File

@ -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);