diff options
Diffstat (limited to 'meta/recipes-extended/sysklogd/files/0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch')
-rw-r--r-- | meta/recipes-extended/sysklogd/files/0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch | 47 |
1 files changed, 0 insertions, 47 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 deleted file mode 100644 index bf43fc6081..0000000000 --- a/meta/recipes-extended/sysklogd/files/0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 50c66de8a9b64d6fa71329ea7d4fe981f3b4ef23 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Thu, 26 Dec 2019 10:03:35 +0800 | ||
4 | Subject: [PATCH] Fix nasty parallel build problem reported by Gentoo and | ||
5 | Westermo | ||
6 | |||
7 | Independently of each other both the Gentoo project and Westermo found | ||
8 | an issue with massively parallel builds on monster-core-machines. At | ||
9 | Westermo there are 40 core Xeon monsters that stumble when building | ||
10 | sysklogd. | ||
11 | |||
12 | The Gentoo bug report is here: | ||
13 | |||
14 | https://bugs.gentoo.org/701894 | ||
15 | |||
16 | The problem stems from strlcat.c and strlcpy.c being used for both | ||
17 | the libcompat convenience library built for libsyslog and als for | ||
18 | syslogd when the system does not have either of the APIs in libc, | ||
19 | i.e. most Linux systems with GLIBC or musl libc. | ||
20 | |||
21 | I can either rewrite the Makefile.am files to handle dependencies | ||
22 | better, or we just disable parallel build like this patch. There's | ||
23 | too few source files to gain anything from parallel build anyway. | ||
24 | |||
25 | Signed-off-by: Joachim Nilsson <troglobit@gmail.com> | ||
26 | |||
27 | Upstream-Status: Backport [https://github.com/troglobit/sysklogd/commit/9cf1f97cef04fed81c2407f7207795d7592ccb96] | ||
28 | |||
29 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
30 | --- | ||
31 | Makefile.am | 3 +++ | ||
32 | 1 file changed, 3 insertions(+) | ||
33 | |||
34 | diff --git a/Makefile.am b/Makefile.am | ||
35 | index 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 | -- | ||
46 | 2.7.4 | ||
47 | |||