From 57341d25db8b16e8a1fc7d40f6f56b5200f3547d Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 27 Mar 2017 08:35:51 -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. BUG: 1429696 Change-Id: Icca2de035255a7759563bf06d853950dddc5724d Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: https://review.gluster.org/16954 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- rpc/xdr/gen/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'rpc/xdr') diff --git a/rpc/xdr/gen/Makefile.am b/rpc/xdr/gen/Makefile.am index 6b701aaf34d..d6f416f93b7 100644 --- a/rpc/xdr/gen/Makefile.am +++ b/rpc/xdr/gen/Makefile.am @@ -18,17 +18,17 @@ 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=.tmpc) $(@:.c=.x) && mv $(@:.c=.tmpc) $@ ; \ - cp $@ $(xdrsrc)/ ;\ + rpcgen -c -o $@ $(@:.c=.x) && cp $@ $(xdrsrc)/ ;\ fi # d*mn sed in netbsd6 doesn't do -i (inline) # (why are we still running smoke on netbsd6 and not netbsd7?) $(XDRHEADERS): $(XDRGENFILES) if [ ! -e $@ -o $(@:.h=.x) -nt $@ ]; then \ - rpcgen -h -o $(@:.h=.tmph) $(@:.h=.x) ; \ - sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' -e '/#endif/ s/-/_/' \ - $(@:.h=.tmph) > $@ && rm -f $(@:.h=.tmph) ; \ + rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \ + sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' \ + -e '/#endif/ s/-/_/' -e 's/TMP_/H_/g' \ + $(@:.h=.tmp) > $@ && rm -f $(@:.h=.tmp) && \ cp $@ $(xdrsrc)/ ; \ fi -- cgit