Index: head/misc/rump/Makefile =================================================================== --- head/misc/rump/Makefile (revision 451755) +++ head/misc/rump/Makefile (revision 451756) @@ -1,30 +1,36 @@ # Created by: vanilla # $FreeBSD$ PORTNAME= rump PORTVERSION= 20170822 PORTREVISION= 1 CATEGORIES= misc MAINTAINER= vanilla@FreeBSD.org COMMENT= Virtualized NetBSD kernel components in userspace LICENSE= BSD2CLAUSE NOT_FOR_ARCHS= aarch64 armv6 mips mips64 powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= not yet ported to FreeBSD on this architecture USE_GITHUB= yes GH_ACCOUNT= rumpkernel GH_PROJECT= buildrump.sh GH_TAGNAME= b914579 GH_TUPLE= rumpkernel:src-netbsd:82f3a69:netbsd/src USE_LDCONFIG= yes +.include + +.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 +.include Index: head/misc/rump/files/patch-src_share_mk_bsd.sys.mk =================================================================== --- head/misc/rump/files/patch-src_share_mk_bsd.sys.mk (revision 451755) +++ head/misc/rump/files/patch-src_share_mk_bsd.sys.mk (revision 451756) @@ -1,11 +1,11 @@ --- src/share/mk/bsd.sys.mk.orig 2016-08-02 11:51:10 UTC +++ src/share/mk/bsd.sys.mk @@ -83,7 +83,7 @@ CFLAGS+= -Wreturn-type -Wswitch -Wshadow .endif .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 Index: head/misc/rump/files/patch-src_sys_net_if__gif.c =================================================================== --- head/misc/rump/files/patch-src_sys_net_if__gif.c (revision 451755) +++ head/misc/rump/files/patch-src_sys_net_if__gif.c (revision 451756) @@ -1,12 +1,12 @@ ---- 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) sc->gif_if.if_addrlen = 0; sc->gif_if.if_mtu = GIF_MTU; - sc->gif_if.if_flags = IFF_POINTOPOINT | IFF_MULTICAST; + int tmp = IFF_POINTOPOINT | IFF_MULTICAST; + sc->gif_if.if_flags = tmp; sc->gif_if.if_extflags = IFEF_NO_LINK_STATE_CHANGE; sc->gif_if.if_ioctl = gif_ioctl; sc->gif_if.if_output = gif_output; Index: head/misc/rump/files/patch-src_sys_net_if__pppoe.c =================================================================== --- head/misc/rump/files/patch-src_sys_net_if__pppoe.c (revision 451755) +++ head/misc/rump/files/patch-src_sys_net_if__pppoe.c (revision 451756) @@ -1,12 +1,12 @@ ---- 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); sc->sc_sppp.pp_if.if_softc = sc; sc->sc_sppp.pp_if.if_mtu = PPPOE_MAXMTU; - sc->sc_sppp.pp_if.if_flags = IFF_SIMPLEX|IFF_POINTOPOINT|IFF_MULTICAST; + int tmp = IFF_SIMPLEX|IFF_POINTOPOINT|IFF_MULTICAST; + sc->sc_sppp.pp_if.if_flags = tmp; sc->sc_sppp.pp_if.if_type = IFT_PPP; sc->sc_sppp.pp_if.if_hdrlen = sizeof(struct ether_header) + PPPOE_HEADERLEN; sc->sc_sppp.pp_if.if_dlt = DLT_PPP_ETHER; Index: head/misc/rump/files/patch-src_sys_net_if__tap.c =================================================================== --- head/misc/rump/files/patch-src_sys_net_if__tap.c (revision 451755) +++ head/misc/rump/files/patch-src_sys_net_if__tap.c (revision 451756) @@ -1,12 +1,12 @@ ---- 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; strcpy(ifp->if_xname, device_xname(self)); ifp->if_softc = sc; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + int tmp = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_flags = tmp; ifp->if_ioctl = tap_ioctl; ifp->if_start = tap_start; ifp->if_stop = tap_stop; Index: head/misc/rump/files/patch-src_sys_netinet_ip__carp.c =================================================================== --- head/misc/rump/files/patch-src_sys_netinet_ip__carp.c (revision 451755) +++ head/misc/rump/files/patch-src_sys_netinet_ip__carp.c (revision 451756) @@ -1,12 +1,12 @@ ---- 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; snprintf(ifp->if_xname, sizeof ifp->if_xname, "%s%d", ifc->ifc_name, unit); - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + int tmp = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_flags = tmp; ifp->if_ioctl = carp_ioctl; ifp->if_start = carp_start; ifp->if_output = carp_output; Index: head/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c =================================================================== --- head/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c (revision 451755) +++ head/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c (revision 451756) @@ -1,12 +1,12 @@ ---- 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) snprintf(ifp->if_xname, sizeof(ifp->if_xname), "shmif%d", unit); ifp->if_softc = sc; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + int tmp = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_flags = tmp; ifp->if_init = shmif_init; ifp->if_ioctl = shmif_ioctl; ifp->if_start = shmif_start;