From e43e818c902a27a9760311b4b8ba6303b34ec2b0 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 24 Mar 2017 08:40:00 -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. Master change https://review.gluster.org/16941 Master BZ: 1429696 Change-Id: I006066f0e7c3f8b65189f97c70089f3422e3e08b BUG: 1430512 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: https://review.gluster.org/16942 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Shyamsundar Ranganathan --- rpc/xdr/gen/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'rpc') diff --git a/rpc/xdr/gen/Makefile.am b/rpc/xdr/gen/Makefile.am index fc6973c1821..7db428e9a8b 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=.tmp) $(@:.c=.x) && mv $(@:.c=.tmp) $@ ; \ - 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=.tmp) $(@:.h=.x) ; \ - sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' -e '/#endif/ s/-/_/' \ - $(@:.h=.tmp) > $@ && rm -f $(@:.h=.tmp) ; \ + 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