summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-07-26 16:42:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-30 12:44:34 +0100
commitc65d565e239be1e991080a37a261a1267bdda19c (patch)
treed21a3d8ed90a0fd83a36c04baef560da975920bd /meta/recipes-devtools
parentd9087c7c477b101fea4d35547da2d0843940cfd9 (diff)
downloadpoky-c65d565e239be1e991080a37a261a1267bdda19c.tar.gz
automake: fix race in parallel builds
While native building, there is a parallel 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] Correct Makefile rule to fix the issue (From OE-Core rev: ef4907f311e3ddedfa3eb8a111cc1d146c19851a) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/automake/automake/0001-build-fix-race-in-parallel-builds.patch65
-rw-r--r--meta/recipes-devtools/automake/automake_1.16.1.bb1
2 files changed, 66 insertions, 0 deletions
diff --git a/meta/recipes-devtools/automake/automake/0001-build-fix-race-in-parallel-builds.patch b/meta/recipes-devtools/automake/automake/0001-build-fix-race-in-parallel-builds.patch
new file mode 100644
index 0000000000..591fce1bf1
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/0001-build-fix-race-in-parallel-builds.patch
@@ -0,0 +1,65 @@
1From 592eb55b248a765abfc796fccb68baa3d53745ac Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 26 Jul 2018 00:58:12 -0700
4Subject: [PATCH] build: fix race in parallel builds
5
6The automake-$(APIVERSION) is a hardlink of automake, if it is
7created later than update_mans executing, there is a failure
8[snip]
9|: && mkdir -p doc && ./pre-inst-env /usr/bin/env perl
10../automake-1.16.1/doc/help2man --output=doc/aclocal-1.16.1
11aclocal-1.16
12|help2man: can't get `--help' info from aclocal-1.16
13|Try `--no-discard-stderr' if option outputs to stderr
14Makefile:3693: recipe for target 'doc/aclocal-1.16.1' failed
15[snip]
16
17The automake_script is required by update_mans and update_mans
18invokes automake-$(APIVERSION) rather than automake to generate
19doc, so we should assign `automake-$(APIVERSION)' to automake_script.
20
21The same reason to tweak aclocal_script.
22
23* bin/local.mk: correct automake_script/aclocal_script
24
25Upstream-Status: Submitted [automake-patches@gnu.org]
26
27Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
28---
29 Makefile.in | 4 ++--
30 bin/local.mk | 4 ++--
31 2 files changed, 4 insertions(+), 4 deletions(-)
32
33diff --git a/Makefile.in b/Makefile.in
34index c3e934c..7cddb8d 100644
35--- a/Makefile.in
36+++ b/Makefile.in
37@@ -691,8 +691,8 @@ bin_SCRIPTS = bin/automake bin/aclocal
38 # Used by maintainer checks and such.
39 automake_in = $(srcdir)/bin/automake.in
40 aclocal_in = $(srcdir)/bin/aclocal.in
41-automake_script = bin/automake
42-aclocal_script = bin/aclocal
43+automake_script = bin/automake-$(APIVERSION)
44+aclocal_script = bin/aclocal-$(APIVERSION)
45 AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
46 info_TEXINFOS = doc/automake.texi doc/automake-history.texi
47 doc_automake_TEXINFOS = doc/fdl.texi
48diff --git a/bin/local.mk b/bin/local.mk
49index 97b38db..058ca99 100644
50--- a/bin/local.mk
51+++ b/bin/local.mk
52@@ -31,8 +31,8 @@ CLEANFILES += \
53 # Used by maintainer checks and such.
54 automake_in = $(srcdir)/%D%/automake.in
55 aclocal_in = $(srcdir)/%D%/aclocal.in
56-automake_script = %D%/automake
57-aclocal_script = %D%/aclocal
58+automake_script = %D%/automake-$(APIVERSION)
59+aclocal_script = %D%/aclocal-$(APIVERSION)
60
61 AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
62 TAGS_FILES += $(AUTOMAKESOURCES)
63--
642.7.4
65
diff --git a/meta/recipes-devtools/automake/automake_1.16.1.bb b/meta/recipes-devtools/automake/automake_1.16.1.bb
index c64ee44d90..d82eed3c60 100644
--- a/meta/recipes-devtools/automake/automake_1.16.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.16.1.bb
@@ -25,6 +25,7 @@ SRC_URI += "file://python-libdir.patch \
25 file://new_rt_path_for_test-driver.patch \ 25 file://new_rt_path_for_test-driver.patch \
26 file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ 26 file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \
27 file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ 27 file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \
28 file://0001-build-fix-race-in-parallel-builds.patch \
28 " 29 "
29 30
30SRC_URI[md5sum] = "83cc2463a4080efd46a72ba2c9f6b8f5" 31SRC_URI[md5sum] = "83cc2463a4080efd46a72ba2c9f6b8f5"