diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2019-12-26 10:10:54 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-30 08:45:02 +0000 |
| commit | 197007bac2ad8cba59fa2c68c51bd95e9b66de92 (patch) | |
| tree | cba61bdae52afe667506b4563acd61edd1a208a6 /meta/recipes-extended/sysklogd | |
| parent | eb286172e413e9d6449dc13ccec1b78c04481eb5 (diff) | |
| download | openembedded-core-contrib-197007bac2ad8cba59fa2c68c51bd95e9b66de92.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
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sysklogd')
| -rw-r--r-- | meta/recipes-extended/sysklogd/files/0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch | 47 | ||||
| -rw-r--r-- | meta/recipes-extended/sysklogd/sysklogd.inc | 1 |
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 @@ +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 + 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 SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \ file://0002-include-sys-types.h-for-off_t.patch \ + file://0001-Fix-nasty-parallel-build-problem-reported-by-Gentoo-.patch \ file://sysklogd \ " S = "${WORKDIR}/git" |