[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: parallel build failure for the 22 branch
From: |
Eli Zaretskii |
Subject: |
Re: parallel build failure for the 22 branch |
Date: |
Sat, 29 Dec 2007 14:23:34 +0200 |
> From: Dan Nicolaescu <dann@ics.uci.edu>
> Date: Wed, 26 Dec 2007 10:23:08 -0800
>
>
> Someone sent me this log for a parallel make failure when building the
> 22 branch.
>
> Can someone please take a look?
Could you ask that person whether the following change fixes the
problem? If not, I'd like to see a full transcript again.
2007-12-29 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (custom-deps, finder-data): Depend on autoloads
instead of loaddefs.el.
Index: lisp/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/Makefile.in,v
retrieving revision 1.85.2.3
diff -u -r1.85.2.3 Makefile.in
--- lisp/Makefile.in 19 Aug 2007 00:24:55 -0000 1.85.2.3
+++ lisp/Makefile.in 29 Dec 2007 12:20:39 -0000
@@ -87,12 +87,16 @@
$(lisp)/cus-load.el:
touch $@
-custom-deps: $(lisp)/subdirs.el $(lisp)/loaddefs.el $(lisp)/cus-load.el doit
+# Note that custom-deps and finder-data depend on autoloads rather
+# than on loaddefs.el, so that autoloads does not run in parallel with
+# them under "make -j", because that could delete loaddefs.el from
+# under their feet.
+custom-deps: $(lisp)/subdirs.el autoloads $(lisp)/cus-load.el doit
wd=$(lisp); $(setwins_almost); \
echo Directories: $$wins; \
$(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file
"$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins
-finder-data: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit
+finder-data: $(lisp)/subdirs.el autoloads doit
wd=$(lisp); $(setwins_almost); \
echo Directories: $$wins; \
$(emacs) -l finder --eval '(setq generated-finder-keywords-file
"$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins