[patch] install-info vs -j

DJ Delorie dj@redhat.com
Thu May 6 09:59:00 GMT 2010


Use unique temporary names so they won't step all over each other with
"make -j".  Tested with and without "-j 10".  Ok to apply?

2010-05-05  DJ Delorie  <dj@redhat.com>

	* libc/Makefile.am (stmp-sigset, stmp-iconvset, stmp-extra,
	stmp-stdio64, stmp-posix,stmp-targetdep): Use unique temporary
	file names to allow for parallel installs.
	(CLEANFILES): Add new temporary file names.

Index: newlib/libc/Makefile.am
===================================================================
RCS file: /cvs/src/src/newlib/libc/Makefile.am,v
retrieving revision 1.17
diff -p -U3 -r1.17 Makefile.am
--- newlib/libc/Makefile.am	22 Apr 2010 23:32:39 -0000	1.17
+++ newlib/libc/Makefile.am	5 May 2010 23:32:07 -0000
@@ -151,69 +151,69 @@ libc.dvi: sigset.texi extra.texi stdio64
 
 stmp-sigset: config.status
 	if test -n "$(LIBC_SIGNAL_LIB)"; then \
-	  echo "@set SIGNALS" >tmp.texi; \
+	  echo "@set SIGNALS" >t-sigset.texi; \
 	else \
-	  echo "@clear SIGNALS" >tmp.texi; \
+	  echo "@clear SIGNALS" >t-sigset.texi; \
 	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi sigset.texi
+	$(SHELL) $(newlib_basedir)/../move-if-change t-sigset.texi sigset.texi
 	touch $@
 
 sigset.texi: stmp-sigset ; @true
 
 stmp-iconvset: config.status
 	if test -n "$(NEWLIB_ICONV_LIBS)"; then \
-	  echo "@set ICONV" >tmp.texi; \
+	  echo "@set ICONV" >t-iconvset.texi; \
 	else \
-	  echo "@clear ICONV" >tmp.texi; \
+	  echo "@clear ICONV" >t-iconvset.texi; \
 	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi iconvset.texi
+	$(SHELL) $(newlib_basedir)/../move-if-change t-iconvset.texi iconvset.texi
 	touch $@
 
 iconvset.texi: stmp-iconvset ; @true
 
 stmp-extra: config.status
 	if test -n "$(LIBC_EXTRA_LIB)"; then \
-	  echo "@set EXTRA" >tmp.texi; \
+	  echo "@set EXTRA" >t-extra.texi; \
 	else \
-	  echo "@clear EXTRA" >tmp.texi; \
+	  echo "@clear EXTRA" >t-extra.texi; \
 	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi extra.texi
+	$(SHELL) $(newlib_basedir)/../move-if-change t-extra.texi extra.texi
 	touch $@
 
 extra.texi: stmp-extra ; @true
 
 stmp-stdio64: config.status
 	if test -n "$(LIBC_STDIO64_LIB)"; then \
-	  echo "@set STDIO64" >tmp.texi; \
+	  echo "@set STDIO64" >t-stdio64.texi; \
 	else \
-	  echo "@clear STDIO64" >tmp.texi; \
+	  echo "@clear STDIO64" >t-stdio64.texi; \
 	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi stdio64.texi
+	$(SHELL) $(newlib_basedir)/../move-if-change t-stdio64.texi stdio64.texi
 	touch $@
 
 stdio64.texi: stmp-stdio64 ; @true
 
 stmp-posix: config.status
 	if test -n "$(LIBC_POSIX_LIB)"; then \
-	  echo "@set POSIX" >tmp.texi; \
+	  echo "@set POSIX" >t-posix.texi; \
 	else \
-	  echo "@clear POSIX" >tmp.texi; \
+	  echo "@clear POSIX" >t-posix.texi; \
 	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi posix.texi
+	$(SHELL) $(newlib_basedir)/../move-if-change t-posix.texi posix.texi
 	touch $@
 
 posix.texi: stmp-posix ; @true
 
 stmp-targetdep: force
-	rm -f tmp.texi
-	targetdoc=`pwd`/tmp.texi; \
+	rm -f t-targetdep.texi
+	targetdoc=`pwd`/t-targetdep.texi; \
 	for d in $(SUBDIRS); do \
 	  if test "$$d" != "."; then \
 	    (cd $$d && $(MAKE) TARGETDOC=$${targetdoc} doc) || exit 1; \
 	  fi; \
 	done
-	cat $(srcdir)/sys.tex >>tmp.texi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi targetdep.tex
+	cat $(srcdir)/sys.tex >>t-targetdep.texi
+	$(SHELL) $(newlib_basedir)/../move-if-change t-targetdep.texi targetdep.tex
 	touch $@
 
 targetdep.tex: stmp-targetdep ; @true
@@ -229,7 +229,9 @@ force:
 
 CLEANFILES = $(CRT0) \
 	sigset.texi stmp-sigset extra.texi stmp-extra \
-	stdio64.texi stmp-stdio64 tmp.texi targetdep.tex stmp-targetdep
+	stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \
+	t-sigset.texi t-iconvset.texi t-extra.texi t-stdio64.texi \
+	t-posix.texi t-targetdep.texi
 
 ACLOCAL_AMFLAGS = -I .. -I ../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host



More information about the Newlib mailing list