Fix building on 10.x.

7 files changed, 14 insertions, 8 deletions

diff --git a/misc/rump/Makefile b/misc/rump/Makefile
index c15f19dbbfbc..a704f850aae7 100644
--- a/misc/rump/Makefile
+++ b/misc/rump/Makefile
@@ -21,10 +21,16 @@ GH_TAGNAME=	b914579
 GH_TUPLE=	rumpkernel:src-netbsd:82f3a69:netbsd/src
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 1100121
+CFLAGS+=	-Wno-address-of-packed-member
+.endif
+
 do-build:
-	cd ${WRKSRC}; ${SETENV} CC=${CC} AR=${AR} NM=${NM} OBJCOPY=${OBJCOPY} ./buildrump.sh -r fullbuild
+	cd ${WRKSRC}; ${SETENV} CC=${CC} AR=${AR} NM=${NM} OBJCOPY=${OBJCOPY} ./buildrump.sh -F CFLAGS="${CFLAGS}" -r fullbuild
 
 do-install:
 	cd ${WRKSRC}/rump; ${PAX} -wr lib include ${STAGEDIR}${PREFIX}/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/rump/files/patch-src_share_mk_bsd.sys.mk b/misc/rump/files/patch-src_share_mk_bsd.sys.mk
index 1fe819cc95c0..f24fd51bac67 100644
--- a/misc/rump/files/patch-src_share_mk_bsd.sys.mk
+++ b/misc/rump/files/patch-src_share_mk_bsd.sys.mk
@@ -5,7 +5,7 @@
  .if ${WARNS} > 2
  CFLAGS+=	-Wcast-qual -Wwrite-strings
 -CFLAGS+=	-Wextra -Wno-unused-parameter
-+CFLAGS+=	-Wextra -Wno-unused-parameter -Wno-address-of-packed-member -Wno-varargs
++CFLAGS+=	-Wextra -Wno-unused-parameter -Wno-varargs
  # Readd -Wno-sign-compare to override -Wextra with clang
  CFLAGS+=	-Wno-sign-compare
  CXXFLAGS+=	-Wabi
diff --git a/misc/rump/files/patch-src_sys_net_if__gif.c b/misc/rump/files/patch-src_sys_net_if__gif.c
index 4e028196a2ee..d438308ae7d2 100644
--- a/misc/rump/files/patch-src_sys_net_if__gif.c
+++ b/misc/rump/files/patch-src_sys_net_if__gif.c
@@ -1,4 +1,4 @@
---- src/sys/net/if_gif.c.orig	2017-09-26 10:05:48 UTC
+--- src/sys/net/if_gif.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/net/if_gif.c
 @@ -192,7 +192,8 @@ gifattach0(struct gif_softc *sc)
  
diff --git a/misc/rump/files/patch-src_sys_net_if__pppoe.c b/misc/rump/files/patch-src_sys_net_if__pppoe.c
index 4f024159e9e0..378145ad06af 100644
--- a/misc/rump/files/patch-src_sys_net_if__pppoe.c
+++ b/misc/rump/files/patch-src_sys_net_if__pppoe.c
@@ -1,4 +1,4 @@
---- src/sys/net/if_pppoe.c.orig	2017-09-26 10:07:00 UTC
+--- src/sys/net/if_pppoe.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/net/if_pppoe.c
 @@ -227,7 +227,8 @@ pppoe_clone_create(struct if_clone *ifc,
  	if_initname(&sc->sc_sppp.pp_if, "pppoe", unit);
diff --git a/misc/rump/files/patch-src_sys_net_if__tap.c b/misc/rump/files/patch-src_sys_net_if__tap.c
index 5d875be0cb10..c7033561b685 100644
--- a/misc/rump/files/patch-src_sys_net_if__tap.c
+++ b/misc/rump/files/patch-src_sys_net_if__tap.c
@@ -1,4 +1,4 @@
---- src/sys/net/if_tap.c.orig	2017-09-26 10:11:03 UTC
+--- src/sys/net/if_tap.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/net/if_tap.c
 @@ -332,7 +332,8 @@ tap_attach(device_t parent, device_t sel
  	ifp = &sc->sc_ec.ec_if;
diff --git a/misc/rump/files/patch-src_sys_netinet_ip__carp.c b/misc/rump/files/patch-src_sys_netinet_ip__carp.c
index be5f2d986209..2e46aa27a7db 100644
--- a/misc/rump/files/patch-src_sys_netinet_ip__carp.c
+++ b/misc/rump/files/patch-src_sys_netinet_ip__carp.c
@@ -1,4 +1,4 @@
---- src/sys/netinet/ip_carp.c.orig	2017-09-26 10:03:06 UTC
+--- src/sys/netinet/ip_carp.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/netinet/ip_carp.c
 @@ -827,7 +827,8 @@ carp_clone_create(struct if_clone *ifc, 
  	ifp->if_softc = sc;
diff --git a/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c b/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c
index 39b9f3a9c16c..fe83cb8f8c34 100644
--- a/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c
+++ b/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c
@@ -1,4 +1,4 @@
---- src/sys/rump/net/lib/libshmif/if_shmem.c.orig	2017-09-26 10:09:42 UTC
+--- src/sys/rump/net/lib/libshmif/if_shmem.c.orig	2016-08-02 11:51:10 UTC
 +++ src/sys/rump/net/lib/libshmif/if_shmem.c
 @@ -176,7 +176,8 @@ allocif(int unit, struct shmif_sc **scp)