|
@@ -1,65 +0,0 @@
|
|
|
-From b952d7064c9cee23857fbc7cb9d761542b98d59a Mon Sep 17 00:00:00 2001
|
|
|
-From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
-Date: Thu, 26 Jul 2018 00:58:12 -0700
|
|
|
-Subject: [PATCH 3/6] build: fix race in parallel builds
|
|
|
-
|
|
|
-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.
|
|
|
-
|
|
|
-* bin/local.mk: correct automake_script/aclocal_script
|
|
|
-
|
|
|
-Upstream-Status: Submitted [automake-patches@gnu.org]
|
|
|
-
|
|
|
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
----
|
|
|
- Makefile.in | 4 ++--
|
|
|
- bin/local.mk | 4 ++--
|
|
|
- 2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
-
|
|
|
-diff --git a/Makefile.in b/Makefile.in
|
|
|
-index a919544..c0f8c0d 100644
|
|
|
---- a/Makefile.in
|
|
|
-+++ b/Makefile.in
|
|
|
-@@ -723,8 +723,8 @@ bin_SCRIPTS = bin/automake bin/aclocal
|
|
|
- # Used by maintainer checks and such.
|
|
|
- automake_in = $(srcdir)/bin/automake.in
|
|
|
- aclocal_in = $(srcdir)/bin/aclocal.in
|
|
|
--automake_script = bin/automake
|
|
|
--aclocal_script = bin/aclocal
|
|
|
-+automake_script = bin/automake-$(APIVERSION)
|
|
|
-+aclocal_script = bin/aclocal-$(APIVERSION)
|
|
|
- AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
|
|
|
- info_TEXINFOS = doc/automake.texi doc/automake-history.texi
|
|
|
- doc_automake_TEXINFOS = doc/fdl.texi
|
|
|
-diff --git a/bin/local.mk b/bin/local.mk
|
|
|
-index 4232448..8f043b0 100644
|
|
|
---- a/bin/local.mk
|
|
|
-+++ b/bin/local.mk
|
|
|
-@@ -31,8 +31,8 @@ CLEANFILES += \
|
|
|
- # Used by maintainer checks and such.
|
|
|
- automake_in = $(srcdir)/%D%/automake.in
|
|
|
- aclocal_in = $(srcdir)/%D%/aclocal.in
|
|
|
--automake_script = %D%/automake
|
|
|
--aclocal_script = %D%/aclocal
|
|
|
-+automake_script = %D%/automake-$(APIVERSION)
|
|
|
-+aclocal_script = %D%/aclocal-$(APIVERSION)
|
|
|
-
|
|
|
- AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
|
|
|
- TAGS_FILES += $(AUTOMAKESOURCES)
|
|
|
---
|
|
|
-2.39.2
|
|
|
-
|