d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistently set RPCGEN_CPP when running rpcgen, so the C preprocessor

Browse Source 
set via ${CPP} is used, instead of always using hardcoded /usr/bin/cpp.

MFC after:	1 week
This commit is contained in:
Dimitry Andric 2012-02-07 09:27:07 +00:00
parent 65d43cc6e7
commit 5e0a19bdee
23 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rpc/Makefile
View File

@ -3,7 +3,7 @@
.SUFFIXES: .x .SUFFIXES: .x
RPCCOM = rpcgen -C RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C
HDRS= rpcb_prot.h HDRS= rpcb_prot.h

2
include/rpcsvc/Makefile
View File

@ -3,7 +3,7 @@
.SUFFIXES: .x .SUFFIXES: .x
RPCCOM = rpcgen -C RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C
HDRS= key_prot.h klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h \ HDRS= key_prot.h klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h \
rquota.h rstat.h rwall.h sm_inter.h spray.h yppasswd.h yp.h \ rquota.h rstat.h rwall.h sm_inter.h spray.h yppasswd.h yp.h \

2
lib/libc/rpc/Makefile.inc
View File

@ -34,7 +34,7 @@ CFLAGS+= -I${.CURDIR}/rpc
CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h
RPCDIR= ${DESTDIR}/usr/include/rpcsvc RPCDIR= ${DESTDIR}/usr/include/rpcsvc
RPCGEN= rpcgen -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h
${RPCGEN} -l -o ${.TARGET} ${RPCDIR}/crypt.x ${RPCGEN} -l -o ${.TARGET} ${RPCDIR}/crypt.x

2
lib/libc/yp/Makefile.inc
View File

@ -10,7 +10,7 @@ CLEANFILES+= yp.h yp_xdr.c
SYM_MAPS+= ${.CURDIR}/yp/Symbol.map SYM_MAPS+= ${.CURDIR}/yp/Symbol.map
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x
RPCGEN= rpcgen -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
yp_xdr.c: ${RPCSRC} yp_xdr.c: ${RPCSRC}
${RPCGEN} -c -o ${.TARGET} ${RPCSRC} ${RPCGEN} -c -o ${.TARGET} ${RPCSRC}

2
lib/librpcsvc/Makefile
View File

@ -18,7 +18,7 @@ SECRPCSRCS= secretkey.c xcrypt.c
OTHERSRCS+= yp_passwd.c yp_update.c OTHERSRCS+= yp_passwd.c yp_update.c
.endif .endif
RPCCOM = rpcgen -C RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C
INCDIRS= -I${DESTDIR}/usr/include/rpcsvc INCDIRS= -I${DESTDIR}/usr/include/rpcsvc

2
lib/libypclnt/Makefile
View File

@ -22,7 +22,7 @@ GENSRCS=yp.h \
yppasswd_private_clnt.c \ yppasswd_private_clnt.c \
yppasswd_private_xdr.c yppasswd_private_xdr.c
RPCGEN= rpcgen -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
RPCSRC= ${.CURDIR}/../../include/rpcsvc/yp.x RPCSRC= ${.CURDIR}/../../include/rpcsvc/yp.x
RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x
RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x

2
libexec/ypxfr/Makefile
View File

@ -22,7 +22,7 @@ LDADD= -lrpcsvc
CLEANFILES= ${GENSRCS} CLEANFILES= ${GENSRCS}
RPCDIR= ${.CURDIR}/../../include/rpcsvc RPCDIR= ${.CURDIR}/../../include/rpcsvc
RPCGEN= rpcgen -I -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
ypxfr_clnt.c: ${RPCDIR}/yp.x ypxfr_clnt.c: ${RPCDIR}/yp.x
rm -f ${.TARGET} rm -f ${.TARGET}

2
release/picobsd/tinyware/passwd/Makefile
View File

@ -26,7 +26,7 @@ CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
CLEANFILES= ${GENSRCS} CLEANFILES= ${GENSRCS}
RPCGEN= rpcgen -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x
RPCSRC_PW= ${DESTDIR}/usr/include/rpcsvc/yppasswd.x RPCSRC_PW= ${DESTDIR}/usr/include/rpcsvc/yppasswd.x
RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x

6
sys/conf/files
View File

@ -2499,17 +2499,17 @@ kern/vfs_vnops.c standard
# #
gssd.h optional kgssapi \ gssd.h optional kgssapi \
dependency "$S/kgssapi/gssd.x" \ dependency "$S/kgssapi/gssd.x" \
compile-with "rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h" \ compile-with "RPCGEN_CPP='${CPP}' rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h" \
no-obj no-implicit-rule before-depend local \ no-obj no-implicit-rule before-depend local \
clean "gssd.h" clean "gssd.h"
gssd_xdr.c optional kgssapi \ gssd_xdr.c optional kgssapi \
dependency "$S/kgssapi/gssd.x gssd.h" \ dependency "$S/kgssapi/gssd.x gssd.h" \
compile-with "rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c" \ compile-with "RPCGEN_CPP='${CPP}' rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c" \
no-implicit-rule before-depend local \ no-implicit-rule before-depend local \
clean "gssd_xdr.c" clean "gssd_xdr.c"
gssd_clnt.c optional kgssapi \ gssd_clnt.c optional kgssapi \
dependency "$S/kgssapi/gssd.x gssd.h" \ dependency "$S/kgssapi/gssd.x gssd.h" \
compile-with "rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c" \ compile-with "RPCGEN_CPP='${CPP}' rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c" \
no-implicit-rule before-depend local \ no-implicit-rule before-depend local \
clean "gssd_clnt.c" clean "gssd_clnt.c"
kgssapi/gss_accept_sec_context.c optional kgssapi kgssapi/gss_accept_sec_context.c optional kgssapi

6
sys/modules/kgssapi/Makefile
View File

@ -44,12 +44,12 @@ CLEANFILES= gssd.h gssd_xdr.c gssd_clnt.c
S= ${.CURDIR}/../.. S= ${.CURDIR}/../..
gssd.h: $S/kgssapi/gssd.x gssd.h: $S/kgssapi/gssd.x
rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h RPCGEN_CPP=${CPP:Q} rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h
gssd_xdr.c: $S/kgssapi/gssd.x gssd_xdr.c: $S/kgssapi/gssd.x
rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c RPCGEN_CPP=${CPP:Q} rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c
gssd_clnt.c: $S/kgssapi/gssd.x gssd_clnt.c: $S/kgssapi/gssd.x
rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c RPCGEN_CPP=${CPP:Q} rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c
.include <bsd.kmod.mk> .include <bsd.kmod.mk>

2
sys/modules/kgssapi_krb5/Makefile
View File

@ -18,6 +18,6 @@ CLEANFILES= gssd.h
S= ${.CURDIR}/../.. S= ${.CURDIR}/../..
gssd.h: $S/kgssapi/gssd.x gssd.h: $S/kgssapi/gssd.x
rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h RPCGEN_CPP=${CPP:Q} rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h
.include <bsd.kmod.mk> .include <bsd.kmod.mk>

2
usr.sbin/amd/Makefile.inc
View File

@ -36,7 +36,7 @@ LIBAMUDIR= ${.CURDIR}/../libamu
.endif .endif
LIBAMU= ${LIBAMUDIR}/libamu.a LIBAMU= ${LIBAMUDIR}/libamu.a
RPCCOM= rpcgen RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen
MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x
NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x

6
usr.sbin/bootparamd/bootparamd/Makefile
View File

@ -18,12 +18,12 @@ CLEANFILES= ${GENSRCS}
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x
bootparam_prot_svc.c: ${RPCSRC} bootparam_prot_svc.c: ${RPCSRC}
rpcgen -C -m -o ${.TARGET} ${RPCSRC} RPCGEN_CPP=${CPP:Q} rpcgen -C -m -o ${.TARGET} ${RPCSRC}
bootparam_prot_xdr.c: ${RPCSRC} bootparam_prot_xdr.c: ${RPCSRC}
rpcgen -C -c -o ${.TARGET} ${RPCSRC} RPCGEN_CPP=${CPP:Q} rpcgen -C -c -o ${.TARGET} ${RPCSRC}
bootparam_prot.h: ${RPCSRC} bootparam_prot.h: ${RPCSRC}
rpcgen -C -h -o ${.TARGET} ${RPCSRC} RPCGEN_CPP=${CPP:Q} rpcgen -C -h -o ${.TARGET} ${RPCSRC}
.include <bsd.prog.mk> .include <bsd.prog.mk>

6
usr.sbin/bootparamd/callbootd/Makefile
View File

@ -13,12 +13,12 @@ CLEANFILES= ${GENSRCS}
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x
bootparam_prot_clnt.c: ${RPCSRC} bootparam_prot_clnt.c: ${RPCSRC}
rpcgen -C -l -o ${.TARGET} ${RPCSRC} RPCGEN_CPP=${CPP:Q} rpcgen -C -l -o ${.TARGET} ${RPCSRC}
bootparam_prot_xdr.c: ${RPCSRC} bootparam_prot_xdr.c: ${RPCSRC}
rpcgen -C -c -o ${.TARGET} ${RPCSRC} RPCGEN_CPP=${CPP:Q} rpcgen -C -c -o ${.TARGET} ${RPCSRC}
bootparam_prot.h: ${RPCSRC} bootparam_prot.h: ${RPCSRC}
rpcgen -C -h -o ${.TARGET} ${RPCSRC} RPCGEN_CPP=${CPP:Q} rpcgen -C -h -o ${.TARGET} ${RPCSRC}
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/gssd/Makefile
View File

@ -13,7 +13,7 @@ LDADD= -lgssapi
CLEANFILES= gssd_svc.c gssd.h CLEANFILES= gssd_svc.c gssd.h
RPCSRC= ${.CURDIR}/../../sys/kgssapi/gssd.x RPCSRC= ${.CURDIR}/../../sys/kgssapi/gssd.x
RPCGEN= rpcgen -L -C -M RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C -M
gssd_svc.c: ${RPCSRC} gssd.h gssd_svc.c: ${RPCSRC} gssd.h
${RPCGEN} -m -o ${.TARGET} ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC}

2
usr.sbin/keyserv/Makefile
View File

@ -15,7 +15,7 @@ RPCDIR= ${DESTDIR}/usr/include/rpcsvc
CLEANFILES= crypt_svc.c crypt.h CLEANFILES= crypt_svc.c crypt.h
RPCGEN= rpcgen -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
crypt_svc.c: ${RPCDIR}/crypt.x crypt_svc.c: ${RPCDIR}/crypt.x
${RPCGEN} -m -o ${.TARGET} ${RPCDIR}/crypt.x ${RPCGEN} -m -o ${.TARGET} ${RPCDIR}/crypt.x

2
usr.sbin/rpc.lockd/Makefile
View File

@ -15,7 +15,7 @@ LDADD= -lrpcsvc -lutil
CLEANFILES= nlm_prot_svc.c nlm_prot.h test CLEANFILES= nlm_prot_svc.c nlm_prot.h test
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x
RPCGEN= rpcgen -L -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C
nlm_prot_svc.c: ${RPCSRC} nlm_prot_svc.c: ${RPCSRC}
${RPCGEN} -m -o ${.TARGET} ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC}

2
usr.sbin/rpc.statd/Makefile
View File

@ -13,7 +13,7 @@ LDADD= -lrpcsvc
CLEANFILES= sm_inter_svc.c sm_inter.h CLEANFILES= sm_inter_svc.c sm_inter.h
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x
RPCGEN= rpcgen -L -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C
sm_inter_svc.c: ${RPCSRC} sm_inter_svc.c: ${RPCSRC}
${RPCGEN} -m -o ${.TARGET} ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC}

2
usr.sbin/rpc.yppasswdd/Makefile
View File

@ -25,7 +25,7 @@ LDADD= -lrpcsvc -lcrypt -lutil
CLEANFILES= ${GENSRCS} CLEANFILES= ${GENSRCS}
RPCGEN= rpcgen -I -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
# We need to remove the 'static' keyword from _rpcsvcstate so that # We need to remove the 'static' keyword from _rpcsvcstate so that
# yppasswdd_main.c can see it. # yppasswdd_main.c can see it.

2
usr.sbin/rpc.ypupdated/Makefile
View File

@ -19,7 +19,7 @@ LDADD= -lrpcsvc
CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h
RPCDIR= ${DESTDIR}/usr/include/rpcsvc RPCDIR= ${DESTDIR}/usr/include/rpcsvc
RPCGEN= rpcgen -I -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
# We need to remove the 'static' keyword from _rpcsvcstate so that # We need to remove the 'static' keyword from _rpcsvcstate so that
# ypupdated_main.c can see it. # ypupdated_main.c can see it.

2
usr.sbin/rpc.ypxfrd/Makefile
View File

@ -17,7 +17,7 @@ LDADD= -lrpcsvc
CLEANFILES= ypxfrd_svc.c ypxfrd.h CLEANFILES= ypxfrd_svc.c ypxfrd.h
RPCDIR= ${.CURDIR}/../../include/rpcsvc RPCDIR= ${.CURDIR}/../../include/rpcsvc
RPCGEN= rpcgen -I -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
# We need to remove the 'static' keyword from _rpcsvcstate so that # We need to remove the 'static' keyword from _rpcsvcstate so that
# ypxfrd_main.c can see it. # ypxfrd_main.c can see it.

2
usr.sbin/yppush/Makefile
View File

@ -14,7 +14,7 @@ CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr
WARNS?= 2 WARNS?= 2
RPCGEN= rpcgen -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
CLEANFILES= ${GENSRCS} CLEANFILES= ${GENSRCS}

2
usr.sbin/ypserv/Makefile
View File

@ -17,7 +17,7 @@ LDADD= -lwrap
CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h
RPCGEN= rpcgen -I -C RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
# We need to remove the 'static' keyword from _rpcsvcstate so that # We need to remove the 'static' keyword from _rpcsvcstate so that
# yp_main.c can see it. # yp_main.c can see it.