[Emacs-diffs] /srv/bzr/emacs/trunk r108748: Fix parallel bootstrap on MS-Windows in lib/ and lisp/.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108748
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2012-06-26 19:57:54 +0300
message:
  Fix parallel bootstrap on MS-Windows in lib/ and lisp/.
  
   lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD.  This
   replaces separate dependency for each object file, which required
   the same object file to be mentioned twice, causing failures in
   parallel builds.
   lisp/makefile.w32-in (compile, compile-always): Depend on
   update-subdirs, not on subdirs.el.  Otherwise, several different
   sub-targets of 'bootstrap' running in parallel could
   simultaneously write to subdirs.el, producing a garbled file.
modified:
  ChangeLog
  lib/makefile.w32-in
  lisp/ChangeLog
  lisp/makefile.w32-in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-06-26 01:05:39 +0000
+++ b/ChangeLog 2012-06-26 16:57:54 +0000
@@ -1,3 +1,10 @@
+2012-06-26  Eli Zaretskii  <address@hidden>
+
+       * lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD.  This
+       replaces separate dependency for each object file, which required
+       the same object file to be mentioned twice, causing failures in
+       parallel builds.
+
 2012-06-26  Paul Eggert  <address@hidden>
 
        Clean out last vestiges of the old HAVE_CONFIG_H stuff.

=== modified file 'lib/makefile.w32-in'
--- a/lib/makefile.w32-in       2012-06-26 01:05:39 +0000
+++ b/lib/makefile.w32-in       2012-06-26 16:57:54 +0000
@@ -183,10 +183,7 @@
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
 #
-$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD
-$(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD
-$(BLD)/sha1.$(O) $(BLD)/sha256.$(O) $(BLD)/sha512.$(O): stamp_BLD
-$(BLD)/filemode.$(O): stamp_BLD
+$(GNULIBOBJS): stamp_BLD
 
 #
 # Headers we would preprocess if we could.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-26 16:23:01 +0000
+++ b/lisp/ChangeLog    2012-06-26 16:57:54 +0000
@@ -1,3 +1,10 @@
+2012-06-26  Eli Zaretskii  <address@hidden>
+
+       * makefile.w32-in (compile, compile-always): Depend on
+       update-subdirs, not on subdirs.el.  Otherwise, several different
+       sub-targets of 'bootstrap' running in parallel could
+       simultaneously write to subdirs.el, producing a garbled file.
+
 2012-06-26  Sam Steingold  <address@hidden>
 
        * files.el (file-name-base): New convenience function.

=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in      2012-06-23 16:58:13 +0000
+++ b/lisp/makefile.w32-in      2012-06-26 16:57:54 +0000
@@ -311,7 +311,7 @@
 # compiled find the right files.
 
 # Need separate version for sh and native cmd.exe
-compile: $(lisp)/subdirs.el compile-$(SHELLTYPE) doit
+compile: update-subdirs compile-$(SHELLTYPE) doit
 
 compile-CMD: autoloads
 #      -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r 
%%g
@@ -340,7 +340,7 @@
 # unconditionally.  Some files don't actually get compiled because they
 # set the local variable no-byte-compile.
 
-compile-always: $(lisp)/subdirs.el compile-always-$(SHELLTYPE) doit
+compile-always: update-subdirs compile-always-$(SHELLTYPE) doit
 
 compile-always-CMD:
 #      -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r 
%%g