[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[automake-commit] 02/02: build: fix race in parallel builds

From: Mike Frysinger
Subject: [automake-commit] 02/02: build: fix race in parallel builds
Date: Wed, 19 Jan 2022 00:19:17 -0500

vapier pushed a commit to branch master
in repository automake.

View the commit online:;a=commitdiff;h=5d02285845acfc20a4900a471c0e7c5e2ff390a0

commit 5d02285845acfc20a4900a471c0e7c5e2ff390a0
Author: Mike Frysinger <>
AuthorDate: Tue Jan 18 04:47:09 2022 -0500

    build: fix race in parallel builds
    As reported by Hongxu Jia:
    > The automake-$(APIVERSION) is a hardlink of automake, if it is
    > created later than update_mans executing, there is a failure
    > [snip]
    > |: && mkdir -p doc && ./pre-inst-env /usr/bin/env perl 
../automake-1.16.1/doc/help2man --output=doc/aclocal-1.16.1 aclocal-1.16
    > |help2man: can't get `--help' info from aclocal-1.16
    > |Try `--no-discard-stderr' if option outputs to stderr
    > Makefile:3693: recipe for target 'doc/aclocal-1.16.1' failed
    > [snip]
    > The automake_script is required by update_mans and update_mans
    > invokes automake-$(APIVERSION) rather than automake to generate
    > doc, so we should assign `automake-$(APIVERSION)' to automake_script.
    > The same reason to tweak aclocal_script.
    However, rather than update the _script variables to point to the
    hardlinked copies of the programs, we can have the help2man steps
    run the existing scripts directly.  This makes the relationship a
    bit more explicit and avoids implicit dependencies on names.
    * doc/ Pass $(aclocal_script) and $(automake_script) to 
    * THANKS: Add Hongxu Jia.
 THANKS       | 1 +
 doc/ | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/THANKS b/THANKS
index 965f280ef..a71af5e92 100644
--- a/THANKS
+++ b/THANKS
@@ -164,6 +164,7 @@ Henrik Frystyk Nielsen
 Hib Eris              
 Hilko Bengen          
 Holger Hans Peter Freyther
+Hongxu Jia            
 Ian Lance Taylor      
 Ignacy Gawedzki       
 Илья Н. Голубев       
diff --git a/doc/ b/doc/
index a29363d2d..06c78823a 100644
--- a/doc/
+++ b/doc/
@@ -46,9 +46,9 @@ update_mans = \
          && echo ".so man1/$$f-$(APIVERSION).1" > $@
 %D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/
-       $(update_mans) aclocal-$(APIVERSION)
+       $(update_mans) $(aclocal_script)
 %D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/
-       $(update_mans) automake-$(APIVERSION)
+       $(update_mans) $(automake_script)
 ## This target is not invoked as a dependency of anything. It exists
 ## merely to make checking the links in automake.texi (that is,

reply via email to

[Prev in Thread] Current Thread [Next in Thread]