summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-12-26 10:10:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-30 08:47:09 +0000
commit0692b3877f76e8a4dcad331342de03f3e3e51012 (patch)
tree340c5f9ea9735666498c9b37df7a3022e340a283
parentb708af54ad35aa7940e946e9d260a3ca2e7a04c1 (diff)
downloadpoky-0692b3877f76e8a4dcad331342de03f3e3e51012.tar.gz
syslogkd: fix parallel compile failed problem
Parallel compile maybe failed with error: error: ../lib/strlcat.o: No such file or directory Makefile:619: recipe for target 'syslogd' failed (From OE-Core rev: 197007bac2ad8cba59fa2c68c51bd95e9b66de92) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysklogd/files/0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch47
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc1
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-extended/sysklogd/files/0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch b/meta/recipes-extended/sysklogd/files/0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch
new file mode 100644
index 0000000000..bf43fc6081
--- /dev/null
+++ b/meta/recipes-extended/sysklogd/files/0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch
@@ -0,0 +1,47 @@
1From 50c66de8a9b64d6fa71329ea7d4fe981f3b4ef23 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 26 Dec 2019 10:03:35 +0800
4Subject: [PATCH] Fix nasty parallel build problem reported by Gentoo and
5 Westermo
6
7Independently of each other both the Gentoo project and Westermo found
8an issue with massively parallel builds on monster-core-machines. At
9Westermo there are 40 core Xeon monsters that stumble when building
10sysklogd.
11
12The Gentoo bug report is here:
13
14 https://bugs.gentoo.org/701894
15
16The problem stems from strlcat.c and strlcpy.c being used for both
17the libcompat convenience library built for libsyslog and als for
18syslogd when the system does not have either of the APIs in libc,
19i.e. most Linux systems with GLIBC or musl libc.
20
21I can either rewrite the Makefile.am files to handle dependencies
22better, or we just disable parallel build like this patch. There's
23too few source files to gain anything from parallel build anyway.
24
25Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
26
27Upstream-Status: Backport [https://github.com/troglobit/sysklogd/commit/9cf1f97cef04fed81c2407f7207795d7592ccb96]
28
29Signed-off-by: Changqing Li <changqing.li@windriver.com>
30---
31 Makefile.am | 3 +++
32 1 file changed, 3 insertions(+)
33
34diff --git a/Makefile.am b/Makefile.am
35index c4cc80f..d7a7dd5 100644
36--- a/Makefile.am
37+++ b/Makefile.am
38@@ -46,3 +46,6 @@ release: distcheck
39 # Workaround for systemd unit file duing distcheck
40 DISTCHECK_CONFIGURE_FLAGS = --with-systemd=$$dc_install_base/$(systemd) --with-klogd
41
42+# Disable parallel build in top Makefile, we might otherwise get a very
43+# # bizarre build problem with strlcpy.o in libcompat and for syslogd.
44+.NOTPARALLEL:
45--
462.7.4
47
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 07edf40326..774d23bfd2 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -16,6 +16,7 @@ inherit update-rc.d update-alternatives systemd autotools
16SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ 16SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
17 file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \ 17 file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \
18 file://0002-include-sys-types.h-for-off_t.patch \ 18 file://0002-include-sys-types.h-for-off_t.patch \
19 file://0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch \
19 file://sysklogd \ 20 file://sysklogd \
20 " 21 "
21S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"