procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add dependencies to fix loaddefs race during parallel builds.

Browse source 
Without this, for example, 'make -j bootstrap' can fail and report
"Opening input file: no such file or directory,
.../lisp/calendar/diary-loaddefs.el ... recipe for target
'calendar/hol-loaddefs.el' failed", where the hol-loaddefs.el rule
got confused because diary-loaddefs.el was being built in parallel.
* Makefile.in ($(CAL_DIR)/diary-loaddefs.el):
Depend on $(CAL_DIR)/cal-loaddefs.el.
($(CAL_DIR)/hol-loaddefs.el): Depend on $(CAL_DIR)/diary-loaddefs.el.
This commit is contained in:
Paul Eggert 2014-08-16 09:50:32 -07:00
parent 2b4c15d829
commit 3bcff29cea
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -1,3 +1,15 @@
2014-08-16 Paul Eggert <eggert@cs.ucla.edu>
Add dependencies to fix loaddefs race during parallel builds.
Without this, for example, 'make -j bootstrap' can fail and report
"Opening input file: no such file or directory,
.../lisp/calendar/diary-loaddefs.el ... recipe for target
'calendar/hol-loaddefs.el' failed", where the hol-loaddefs.el rule
got confused because diary-loaddefs.el was being built in parallel.
* Makefile.in ($(CAL_DIR)/diary-loaddefs.el):
Depend on $(CAL_DIR)/cal-loaddefs.el.
($(CAL_DIR)/hol-loaddefs.el): Depend on $(CAL_DIR)/diary-loaddefs.el.
2014-08-16 Martin Rudalics <rudalics@gmx.at>
* scroll-bar.el (scroll-bar-horizontal-drag-1): Use cdr of

4
lisp/Makefile.in
View file

@ -455,13 +455,13 @@ $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
--eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
-f batch-update-autoloads $(CAL_DIR)
$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC)
$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/cal-loaddefs.el
$(emacs) -l autoload \
--eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
--eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
-f batch-update-autoloads $(CAL_DIR)
$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el
$(emacs) -l autoload \
--eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
--eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \