blob: bf43fc6081cfe39c4b2e7a7927abd4fd0d5d26bd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 50c66de8a9b64d6fa71329ea7d4fe981f3b4ef23 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 26 Dec 2019 10:03:35 +0800
Subject: [PATCH] Fix nasty parallel build problem reported by Gentoo and
Westermo
Independently of each other both the Gentoo project and Westermo found
an issue with massively parallel builds on monster-core-machines. At
Westermo there are 40 core Xeon monsters that stumble when building
sysklogd.
The Gentoo bug report is here:
https://bugs.gentoo.org/701894
The problem stems from strlcat.c and strlcpy.c being used for both
the libcompat convenience library built for libsyslog and als for
syslogd when the system does not have either of the APIs in libc,
i.e. most Linux systems with GLIBC or musl libc.
I can either rewrite the Makefile.am files to handle dependencies
better, or we just disable parallel build like this patch. There's
too few source files to gain anything from parallel build anyway.
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
Upstream-Status: Backport [https://github.com/troglobit/sysklogd/commit/9cf1f97cef04fed81c2407f7207795d7592ccb96]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
Makefile.am | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index c4cc80f..d7a7dd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,3 +46,6 @@ release: distcheck
# Workaround for systemd unit file duing distcheck
DISTCHECK_CONFIGURE_FLAGS = --with-systemd=$$dc_install_base/$(systemd) --with-klogd
+# Disable parallel build in top Makefile, we might otherwise get a very
+# # bizarre build problem with strlcpy.o in libcompat and for syslogd.
+.NOTPARALLEL:
--
2.7.4
|
