Date: Tue, 14 Feb 2012 19:49:07 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r231704 - in stable/8: include/rpc include/rpcsvc lib/libc/rpc lib/libc/yp lib/librpcsvc lib/libypclnt libexec/ypxfr release/picobsd/tinyware/passwd sys/conf sys/modules/kgssapi sys/mod... Message-ID: <201202141949.q1EJn77O015186@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Feb 14 19:49:06 2012 New Revision: 231704 URL: http://svn.freebsd.org/changeset/base/231704 Log: MFC r231118: Consistently set RPCGEN_CPP when running rpcgen, so the C preprocessor set via ${CPP} is used, instead of always using hardcoded /usr/bin/cpp. Modified: stable/8/include/rpc/Makefile stable/8/include/rpcsvc/Makefile stable/8/lib/libc/rpc/Makefile.inc stable/8/lib/libc/yp/Makefile.inc stable/8/lib/librpcsvc/Makefile stable/8/lib/libypclnt/Makefile stable/8/libexec/ypxfr/Makefile stable/8/release/picobsd/tinyware/passwd/Makefile stable/8/sys/conf/files stable/8/sys/modules/kgssapi/Makefile stable/8/sys/modules/kgssapi_krb5/Makefile stable/8/usr.sbin/amd/Makefile.inc stable/8/usr.sbin/bootparamd/bootparamd/Makefile stable/8/usr.sbin/bootparamd/callbootd/Makefile stable/8/usr.sbin/gssd/Makefile stable/8/usr.sbin/keyserv/Makefile stable/8/usr.sbin/rpc.lockd/Makefile stable/8/usr.sbin/rpc.statd/Makefile stable/8/usr.sbin/rpc.yppasswdd/Makefile stable/8/usr.sbin/rpc.ypupdated/Makefile stable/8/usr.sbin/rpc.ypxfrd/Makefile stable/8/usr.sbin/yppush/Makefile stable/8/usr.sbin/ypserv/Makefile Directory Properties: stable/8/include/ (props changed) stable/8/lib/libc/ (props changed) stable/8/lib/librpcsvc/ (props changed) stable/8/lib/libypclnt/ (props changed) stable/8/libexec/ypxfr/ (props changed) stable/8/release/picobsd/tinyware/passwd/ (props changed) stable/8/sys/ (props changed) stable/8/usr.sbin/amd/ (props changed) stable/8/usr.sbin/bootparamd/ (props changed) stable/8/usr.sbin/gssd/ (props changed) stable/8/usr.sbin/keyserv/ (props changed) stable/8/usr.sbin/rpc.lockd/ (props changed) stable/8/usr.sbin/rpc.statd/ (props changed) stable/8/usr.sbin/rpc.yppasswdd/ (props changed) stable/8/usr.sbin/rpc.ypupdated/ (props changed) stable/8/usr.sbin/rpc.ypxfrd/ (props changed) stable/8/usr.sbin/yppush/ (props changed) stable/8/usr.sbin/ypserv/ (props changed) Modified: stable/8/include/rpc/Makefile ============================================================================== --- stable/8/include/rpc/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/include/rpc/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -3,7 +3,7 @@ .SUFFIXES: .x -RPCCOM = rpcgen -C +RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C HDRS= rpcb_prot.h Modified: stable/8/include/rpcsvc/Makefile ============================================================================== --- stable/8/include/rpcsvc/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/include/rpcsvc/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -3,7 +3,7 @@ .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 \ rquota.h rstat.h rwall.h sm_inter.h spray.h yppasswd.h yp.h \ Modified: stable/8/lib/libc/rpc/Makefile.inc ============================================================================== --- stable/8/lib/libc/rpc/Makefile.inc Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/lib/libc/rpc/Makefile.inc Tue Feb 14 19:49:06 2012 (r231704) @@ -34,7 +34,7 @@ CFLAGS+= -I${.CURDIR}/rpc CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h RPCDIR= ${DESTDIR}/usr/include/rpcsvc -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h ${RPCGEN} -l -o ${.TARGET} ${RPCDIR}/crypt.x Modified: stable/8/lib/libc/yp/Makefile.inc ============================================================================== --- stable/8/lib/libc/yp/Makefile.inc Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/lib/libc/yp/Makefile.inc Tue Feb 14 19:49:06 2012 (r231704) @@ -10,7 +10,7 @@ CLEANFILES+= yp.h yp_xdr.c SYM_MAPS+= ${.CURDIR}/yp/Symbol.map RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C yp_xdr.c: ${RPCSRC} ${RPCGEN} -c -o ${.TARGET} ${RPCSRC} Modified: stable/8/lib/librpcsvc/Makefile ============================================================================== --- stable/8/lib/librpcsvc/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/lib/librpcsvc/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -18,7 +18,7 @@ SECRPCSRCS= secretkey.c xcrypt.c OTHERSRCS+= yp_passwd.c yp_update.c .endif -RPCCOM = rpcgen -C +RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C INCDIRS= -I${DESTDIR}/usr/include/rpcsvc Modified: stable/8/lib/libypclnt/Makefile ============================================================================== --- stable/8/lib/libypclnt/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/lib/libypclnt/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -23,7 +23,7 @@ GENSRCS=yp.h \ yppasswd_private_clnt.c \ yppasswd_private_xdr.c -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} 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 Modified: stable/8/libexec/ypxfr/Makefile ============================================================================== --- stable/8/libexec/ypxfr/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/libexec/ypxfr/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -19,7 +19,7 @@ LDADD= -lrpcsvc CLEANFILES= ${GENSRCS} RPCDIR= ${.CURDIR}/../../include/rpcsvc -RPCGEN= rpcgen -I -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C ypxfr_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} Modified: stable/8/release/picobsd/tinyware/passwd/Makefile ============================================================================== --- stable/8/release/picobsd/tinyware/passwd/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/release/picobsd/tinyware/passwd/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -26,7 +26,7 @@ CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CU CLEANFILES= ${GENSRCS} -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x RPCSRC_PW= ${DESTDIR}/usr/include/rpcsvc/yppasswd.x RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x Modified: stable/8/sys/conf/files ============================================================================== --- stable/8/sys/conf/files Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/sys/conf/files Tue Feb 14 19:49:06 2012 (r231704) @@ -2289,17 +2289,17 @@ kern/vfs_vnops.c standard # gssd.h optional kgssapi \ 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 \ clean "gssd.h" gssd_xdr.c optional kgssapi \ 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 \ clean "gssd_xdr.c" gssd_clnt.c optional kgssapi \ 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 \ clean "gssd_clnt.c" kgssapi/gss_accept_sec_context.c optional kgssapi Modified: stable/8/sys/modules/kgssapi/Makefile ============================================================================== --- stable/8/sys/modules/kgssapi/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/sys/modules/kgssapi/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -44,12 +44,12 @@ CLEANFILES= gssd.h gssd_xdr.c gssd_clnt. S= ${.CURDIR}/../.. 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 - 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 - 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> Modified: stable/8/sys/modules/kgssapi_krb5/Makefile ============================================================================== --- stable/8/sys/modules/kgssapi_krb5/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/sys/modules/kgssapi_krb5/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -18,6 +18,6 @@ CLEANFILES= gssd.h S= ${.CURDIR}/../.. 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> Modified: stable/8/usr.sbin/amd/Makefile.inc ============================================================================== --- stable/8/usr.sbin/amd/Makefile.inc Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/amd/Makefile.inc Tue Feb 14 19:49:06 2012 (r231704) @@ -36,7 +36,7 @@ LIBAMUDIR= ${.CURDIR}/../libamu .endif LIBAMU= ${LIBAMUDIR}/libamu.a -RPCCOM= rpcgen +RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x Modified: stable/8/usr.sbin/bootparamd/bootparamd/Makefile ============================================================================== --- stable/8/usr.sbin/bootparamd/bootparamd/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/bootparamd/bootparamd/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -18,12 +18,12 @@ CLEANFILES= ${GENSRCS} RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x 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} - rpcgen -C -c -o ${.TARGET} ${RPCSRC} + RPCGEN_CPP=${CPP:Q} rpcgen -C -c -o ${.TARGET} ${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> Modified: stable/8/usr.sbin/bootparamd/callbootd/Makefile ============================================================================== --- stable/8/usr.sbin/bootparamd/callbootd/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/bootparamd/callbootd/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -13,12 +13,12 @@ CLEANFILES= ${GENSRCS} RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x 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} - rpcgen -C -c -o ${.TARGET} ${RPCSRC} + RPCGEN_CPP=${CPP:Q} rpcgen -C -c -o ${.TARGET} ${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> Modified: stable/8/usr.sbin/gssd/Makefile ============================================================================== --- stable/8/usr.sbin/gssd/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/gssd/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -13,7 +13,7 @@ LDADD= -lgssapi CLEANFILES= gssd_svc.c gssd.h 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 ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} Modified: stable/8/usr.sbin/keyserv/Makefile ============================================================================== --- stable/8/usr.sbin/keyserv/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/keyserv/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -15,7 +15,7 @@ RPCDIR= ${DESTDIR}/usr/include/rpcsvc CLEANFILES= crypt_svc.c crypt.h -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C crypt_svc.c: ${RPCDIR}/crypt.x ${RPCGEN} -m -o ${.TARGET} ${RPCDIR}/crypt.x Modified: stable/8/usr.sbin/rpc.lockd/Makefile ============================================================================== --- stable/8/usr.sbin/rpc.lockd/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/rpc.lockd/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -15,7 +15,7 @@ LDADD= -lrpcsvc -lutil CLEANFILES= nlm_prot_svc.c nlm_prot.h test 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} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} Modified: stable/8/usr.sbin/rpc.statd/Makefile ============================================================================== --- stable/8/usr.sbin/rpc.statd/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/rpc.statd/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -13,7 +13,7 @@ LDADD= -lrpcsvc CLEANFILES= sm_inter_svc.c sm_inter.h 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} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} Modified: stable/8/usr.sbin/rpc.yppasswdd/Makefile ============================================================================== --- stable/8/usr.sbin/rpc.yppasswdd/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/rpc.yppasswdd/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -25,7 +25,7 @@ LDADD= -lrpcsvc -lcrypt -lutil 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 # yppasswdd_main.c can see it. Modified: stable/8/usr.sbin/rpc.ypupdated/Makefile ============================================================================== --- stable/8/usr.sbin/rpc.ypupdated/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/rpc.ypupdated/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -17,7 +17,7 @@ LDADD= -lrpcsvc CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h 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 # ypupdated_main.c can see it. Modified: stable/8/usr.sbin/rpc.ypxfrd/Makefile ============================================================================== --- stable/8/usr.sbin/rpc.ypxfrd/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/rpc.ypxfrd/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -15,7 +15,7 @@ LDADD= -lrpcsvc CLEANFILES= ypxfrd_svc.c ypxfrd.h 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 # ypxfrd_main.c can see it. Modified: stable/8/usr.sbin/yppush/Makefile ============================================================================== --- stable/8/usr.sbin/yppush/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/yppush/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -12,7 +12,7 @@ GENSRCS=yp.h yp_clnt.c yppush_svc.c CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr -RPCGEN= rpcgen -C +RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C CLEANFILES= ${GENSRCS} Modified: stable/8/usr.sbin/ypserv/Makefile ============================================================================== --- stable/8/usr.sbin/ypserv/Makefile Tue Feb 14 19:48:57 2012 (r231703) +++ stable/8/usr.sbin/ypserv/Makefile Tue Feb 14 19:49:06 2012 (r231704) @@ -15,7 +15,7 @@ LDADD= -lwrap 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 # yp_main.c can see it.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202141949.q1EJn77O015186>