svn commit: r451756 - in head/misc/rump: . files
Vanilla I. Shu
vanilla at FreeBSD.org
Wed Oct 11 15:31:57 UTC 2017
Author: vanilla
Date: Wed Oct 11 15:31:55 2017
New Revision: 451756
URL: https://svnweb.freebsd.org/changeset/ports/451756
Log:
Fix building on 10.x.
Modified:
head/misc/rump/Makefile
head/misc/rump/files/patch-src_share_mk_bsd.sys.mk
head/misc/rump/files/patch-src_sys_net_if__gif.c
head/misc/rump/files/patch-src_sys_net_if__pppoe.c
head/misc/rump/files/patch-src_sys_net_if__tap.c
head/misc/rump/files/patch-src_sys_netinet_ip__carp.c
head/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c
Modified: head/misc/rump/Makefile
==============================================================================
--- head/misc/rump/Makefile Wed Oct 11 14:49:22 2017 (r451755)
+++ head/misc/rump/Makefile Wed Oct 11 15:31:55 2017 (r451756)
@@ -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>
Modified: head/misc/rump/files/patch-src_share_mk_bsd.sys.mk
==============================================================================
--- head/misc/rump/files/patch-src_share_mk_bsd.sys.mk Wed Oct 11 14:49:22 2017 (r451755)
+++ head/misc/rump/files/patch-src_share_mk_bsd.sys.mk Wed Oct 11 15:31:55 2017 (r451756)
@@ -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
Modified: head/misc/rump/files/patch-src_sys_net_if__gif.c
==============================================================================
--- head/misc/rump/files/patch-src_sys_net_if__gif.c Wed Oct 11 14:49:22 2017 (r451755)
+++ head/misc/rump/files/patch-src_sys_net_if__gif.c Wed Oct 11 15:31:55 2017 (r451756)
@@ -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)
Modified: head/misc/rump/files/patch-src_sys_net_if__pppoe.c
==============================================================================
--- head/misc/rump/files/patch-src_sys_net_if__pppoe.c Wed Oct 11 14:49:22 2017 (r451755)
+++ head/misc/rump/files/patch-src_sys_net_if__pppoe.c Wed Oct 11 15:31:55 2017 (r451756)
@@ -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);
Modified: head/misc/rump/files/patch-src_sys_net_if__tap.c
==============================================================================
--- head/misc/rump/files/patch-src_sys_net_if__tap.c Wed Oct 11 14:49:22 2017 (r451755)
+++ head/misc/rump/files/patch-src_sys_net_if__tap.c Wed Oct 11 15:31:55 2017 (r451756)
@@ -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;
Modified: head/misc/rump/files/patch-src_sys_netinet_ip__carp.c
==============================================================================
--- head/misc/rump/files/patch-src_sys_netinet_ip__carp.c Wed Oct 11 14:49:22 2017 (r451755)
+++ head/misc/rump/files/patch-src_sys_netinet_ip__carp.c Wed Oct 11 15:31:55 2017 (r451756)
@@ -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;
Modified: 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 Wed Oct 11 14:49:22 2017 (r451755)
+++ head/misc/rump/files/patch-src_sys_rump_net_lib_libshmif_if__shmem.c Wed Oct 11 15:31:55 2017 (r451756)
@@ -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)
More information about the svn-ports-head
mailing list