diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-03-24 08:32:39 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2017-03-27 06:52:27 -0400 |
| commit | b96da537f60d75f896973c9f61007baec42fcf17 (patch) | |
| tree | 632fb43b941ad50f342a012e1d6e94ea9eabd5dd /rpc/xdr | |
| parent | f91596e6566c605e70a31a60523d11f78a097c3c (diff) | |
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 <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/16941
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Anoop C S <anoopcs@redhat.com>
Diffstat (limited to 'rpc/xdr')
| -rw-r--r-- | rpc/xdr/gen/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rpc/xdr/gen/Makefile.am b/rpc/xdr/gen/Makefile.am index fc6973c1821..6b701aaf34d 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 |