diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-03-27 08:35:51 -0400 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-03-29 07:22:26 -0400 |
| commit | 57341d25db8b16e8a1fc7d40f6f56b5200f3547d (patch) | |
| tree | e368dce4a283ebd5d6a635bdd3d8eb26091ae074 | |
| parent | 0f98f5c8070904810252c6fc1df23747afa4b1d7 (diff) | |
| download | glusterfs-57341d25db8b16e8a1fc7d40f6f56b5200f3547d.tar.gz glusterfs-57341d25db8b16e8a1fc7d40f6f56b5200f3547d.tar.xz glusterfs-57341d25db8b16e8a1fc7d40f6f56b5200f3547d.zip | |
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 <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/16954
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>
| -rw-r--r-- | rpc/xdr/gen/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rpc/xdr/gen/Makefile.am b/rpc/xdr/gen/Makefile.am index 6b701aaf34..d6f416f93b 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 |