From b96da537f60d75f896973c9f61007baec42fcf17 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 24 Mar 2017 08:32:39 -0400 Subject: build: errors generating xdr stubs+headers with `make -j` Using a makebomb, on f23 at least, blows up when generating the xdr headers and stubs. (Works reliably on f25 though, go figure.) This change appears to mitigate the race on f23. Change-Id: I006066f0e7c3f8b65189f97c70089f3422e3e08b BUG: 1429696 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: https://review.gluster.org/16941 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos Tested-by: Anoop C S --- rpc/xdr/gen/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rpc') diff --git a/rpc/xdr/gen/Makefile.am b/rpc/xdr/gen/Makefile.am index fc6973c182..6b701aaf34 100644 --- a/rpc/xdr/gen/Makefile.am +++ b/rpc/xdr/gen/Makefile.am @@ -18,7 +18,7 @@ xdrsrc=$(top_srcdir)/rpc/xdr/src # in the build. Or we do this crufty thing instead. $(XDRSOURCES): $(XDRGENFILES) if [ ! -e $@ -o $(@:.c=.x) -nt $@ ]; then \ - rpcgen -c -o $(@:.c=.tmp) $(@:.c=.x) && mv $(@:.c=.tmp) $@ ; \ + rpcgen -c -o $(@:.c=.tmpc) $(@:.c=.x) && mv $(@:.c=.tmpc) $@ ; \ cp $@ $(xdrsrc)/ ;\ fi @@ -26,9 +26,9 @@ $(XDRSOURCES): $(XDRGENFILES) # (why are we still running smoke on netbsd6 and not netbsd7?) $(XDRHEADERS): $(XDRGENFILES) if [ ! -e $@ -o $(@:.h=.x) -nt $@ ]; then \ - rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) ; \ + rpcgen -h -o $(@:.h=.tmph) $(@:.h=.x) ; \ sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' -e '/#endif/ s/-/_/' \ - $(@:.h=.tmp) > $@ && rm -f $(@:.h=.tmp) ; \ + $(@:.h=.tmph) > $@ && rm -f $(@:.h=.tmph) ; \ cp $@ $(xdrsrc)/ ; \ fi -- cgit