From: zrj Date: Tue, 30 Jan 2018 11:38:27 +0000 (+0200) Subject: rpc: Add support for NO_WCAST_FUNCTION_TYPE make variables. X-Git-Tag: v5.5.0~757 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d4e390fc9a3878b804ce122fbda94892c11fa301 rpc: Add support for NO_WCAST_FUNCTION_TYPE make variables. It is unfortunate that has the "bool_t xdr_void(void);" without the XDR* parameter even if it is unused. Since we do not want to change public symbol interface, suppressing the warning is a better way. While there, add suppression to acpiexec/inetd for function cast too. --- diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile index 6ab48f4109..0e98929d8a 100644 --- a/lib/libypclnt/Makefile +++ b/lib/libypclnt/Makefile @@ -25,6 +25,7 @@ RPCGEN= rpcgen -C RPCSRC= ${.CURDIR}/../../include/rpcsvc/yp.x RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x +NO_WCAST_FUNCTION_TYPE= yp.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC} diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile index bac920943a..c357fa2b3d 100644 --- a/libexec/rpc.rquotad/Makefile +++ b/libexec/rpc.rquotad/Makefile @@ -7,4 +7,6 @@ MAN = rpc.rquotad.8 DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile index 58a3560bca..a0b5b7dd3a 100644 --- a/libexec/ypxfr/Makefile +++ b/libexec/ypxfr/Makefile @@ -20,6 +20,7 @@ CLEANFILES= ${GENSRCS} RPCDIR= ${.CURDIR}/../../include/rpcsvc RPCGEN= rpcgen -I -C +NO_WCAST_FUNCTION_TYPE= ypxfr_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile index 305b0644f5..fc66a03b74 100644 --- a/sbin/mount_nfs/Makefile +++ b/sbin/mount_nfs/Makefile @@ -9,6 +9,7 @@ MAN= mount_nfs.8 LDADD= -lutil DPADD= ${LIBUTIL} +NO_WCAST_FUNCTION_TYPE= UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall CFLAGS+= -DNFS -I${UMNTALL} .PATH: ${UMNTALL} diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile index 2378b29216..f3b6bbd981 100644 --- a/sbin/mountd/Makefile +++ b/sbin/mountd/Makefile @@ -9,4 +9,6 @@ WARNS?= 3 DPADD= ${LIBUTIL} LDADD= -lutil +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile index 95cae6100b..6a12adf986 100644 --- a/sbin/umount/Makefile +++ b/sbin/umount/Makefile @@ -1,12 +1,12 @@ # @(#)Makefile 8.4 (Berkeley) 6/22/95 # # $FreeBSD: src/sbin/umount/Makefile,v 1.6.2.1 2001/04/25 10:58:54 ru Exp $ -# $DragonFly: src/sbin/umount/Makefile,v 1.3 2006/10/17 00:55:44 pavalos Exp $ PROG= umount SRCS= umount.c vfslist.c mounttab.c MAN= umount.8 +NO_WCAST_FUNCTION_TYPE= MOUNT= ${.CURDIR}/../mount UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall CFLAGS+= -I${MOUNT} -I${UMNTALL} diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 4bc3220d63..5ef7533be3 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -101,6 +101,9 @@ CWARNFLAGS += -Werror . endif .endif +.if defined(NO_WCAST_FUNCTION_TYPE) && ${WARNS} >= 3 && ${CCVER:Mgcc8*} +_cnowarnflags += -Wno-cast-function-type +.endif .if defined(NO_WARRAY_BOUNDS) _cnowarnflags += -Wno-array-bounds .endif diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile index fb616da428..a674c0db70 100644 --- a/usr.bin/rup/Makefile +++ b/usr.bin/rup/Makefile @@ -1,9 +1,10 @@ # $FreeBSD: src/usr.bin/rup/Makefile,v 1.4.2.1 2001/04/25 11:29:37 ru Exp $ -# $DragonFly: src/usr.bin/rup/Makefile,v 1.4 2007/08/27 16:50:58 pavalos Exp $ PROG= rup DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile index 9e317fa487..4d6f5c394d 100644 --- a/usr.bin/rusers/Makefile +++ b/usr.bin/rusers/Makefile @@ -1,9 +1,10 @@ # $FreeBSD: src/usr.bin/rusers/Makefile,v 1.4.2.1 2001/04/25 11:29:37 ru Exp $ -# $DragonFly: src/usr.bin/rusers/Makefile,v 1.3 2007/08/27 16:50:58 pavalos Exp $ PROG = rusers DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile index 55511547cc..379195aae4 100644 --- a/usr.bin/rwall/Makefile +++ b/usr.bin/rwall/Makefile @@ -1,9 +1,10 @@ # $FreeBSD: src/usr.bin/rwall/Makefile,v 1.4.2.1 2001/04/25 11:29:38 ru Exp $ -# $DragonFly: src/usr.bin/rwall/Makefile,v 1.4 2007/08/27 16:50:58 pavalos Exp $ PROG= rwall DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile index 1fa867d500..659e7ac112 100644 --- a/usr.bin/showmount/Makefile +++ b/usr.bin/showmount/Makefile @@ -1,8 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.bin/showmount/Makefile,v 1.3.14.1 2001/04/25 11:29:39 ru Exp $ -# $DragonFly: src/usr.bin/showmount/Makefile,v 1.4 2007/08/27 16:50:58 pavalos Exp $ PROG= showmount MAN= showmount.8 +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/usr.sbin/acpi/acpiexec/Makefile b/usr.sbin/acpi/acpiexec/Makefile index 4b5af66bd1..8e6d1c16a2 100644 --- a/usr.sbin/acpi/acpiexec/Makefile +++ b/usr.sbin/acpi/acpiexec/Makefile @@ -225,4 +225,7 @@ CFLAGS+= \ LDADD+= -lpthread DPADD+= ${LIBPTHREAD} +# XXX issue with ACPI_OSD_EXEC_CALLBACK +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile index 779a30b769..df8198286e 100644 --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -12,4 +12,7 @@ CFLAGS+=-DINET6 -DLOGIN_CAP DPADD+= ${LIBUTIL} ${LIBWRAP} LDADD+= -lutil -lwrap +# smth very strange with "sep = tcpmux(ctrl)" +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile index a2bcb0dd98..e6edd13bb0 100644 --- a/usr.sbin/rpc.lockd/Makefile +++ b/usr.sbin/rpc.lockd/Makefile @@ -16,6 +16,7 @@ CLEANFILES= nlm_prot_svc.c test RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x RPCGEN= rpcgen -L -C +NO_WCAST_FUNCTION_TYPE= nlm_prot_svc.c: ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile index e998ec0421..adabb5d811 100644 --- a/usr.sbin/rpc.statd/Makefile +++ b/usr.sbin/rpc.statd/Makefile @@ -13,6 +13,7 @@ CLEANFILES= sm_inter_svc.c sm_inter.h RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x RPCGEN= rpcgen -L -C +NO_WCAST_FUNCTION_TYPE= sm_inter_svc.c: ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile index 469246e4c4..a48626c12d 100644 --- a/usr.sbin/rpc.umntall/Makefile +++ b/usr.sbin/rpc.umntall/Makefile @@ -1,9 +1,10 @@ # @(#)Makefile 8.4 (Berkeley) 6/22/95 # $FreeBSD: src/usr.sbin/rpc.umntall/Makefile,v 1.1.2.1 2001/04/25 12:10:46 ru Exp $ -# $DragonFly: src/usr.sbin/rpc.umntall/Makefile,v 1.3 2005/04/02 20:49:56 joerg Exp $ PROG= rpc.umntall SRCS= rpc.umntall.c mounttab.c MAN= rpc.umntall.8 +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index 5451c2c813..cc7b868ea1 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -26,6 +26,7 @@ LDADD= -lrpcsvc -lcrypt -lutil CLEANFILES= ${GENSRCS} RPCGEN= rpcgen -I -C +NO_WCAST_FUNCTION_TYPE= # We need to remove the 'static' keyword from _rpcsvcstate so that # yppasswdd_main.c can see it. diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile index c52d99aa8f..88901d6beb 100644 --- a/usr.sbin/rpcbind/Makefile +++ b/usr.sbin/rpcbind/Makefile @@ -8,6 +8,7 @@ SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \ rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c WARNS?= 3 NO_STRICT_ALIASING= +NO_WCAST_FUNCTION_TYPE= CFLAGS+= -DPORTMAP -DLIBWRAP diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile index 6a20b91ac2..1b0949bd7c 100644 --- a/usr.sbin/spray/Makefile +++ b/usr.sbin/spray/Makefile @@ -1,9 +1,10 @@ # $FreeBSD: src/usr.sbin/spray/Makefile,v 1.5.2.1 2001/04/25 12:10:58 ru Exp $ -# $DragonFly: src/usr.sbin/spray/Makefile,v 1.3 2005/03/19 17:43:18 liamfoy Exp $ PROG= spray MAN= spray.8 DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc +NO_WCAST_FUNCTION_TYPE= + .include diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile index 84d370160b..ae08e71d9b 100644 --- a/usr.sbin/yp_mkdb/Makefile +++ b/usr.sbin/yp_mkdb/Makefile @@ -3,6 +3,7 @@ PROG= yp_mkdb SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c WARNS?= 3 +NO_WCAST_FUNCTION_TYPE= MAN= yp_mkdb.8 diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile index 55eeeec953..e5fd097406 100644 --- a/usr.sbin/yppush/Makefile +++ b/usr.sbin/yppush/Makefile @@ -14,6 +14,7 @@ WARNS?= 3 CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr RPCGEN= rpcgen -C +NO_WCAST_FUNCTION_TYPE= CLEANFILES= ${GENSRCS}