From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/files/, app-admin/sysklogd/
Date: Mon, 9 Dec 2019 10:56:09 +0000 (UTC) [thread overview]
Message-ID: <1575888962.a195cb3f7ab35db9a071e70b513a893c998a02f7.polynomial-c@gentoo> (raw)
commit: a195cb3f7ab35db9a071e70b513a893c998a02f7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 9 10:55:38 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 9 10:56:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a195cb3f
app-admin/sysklogd: "Fixed" parallel build issue
Closes: https://bugs.gentoo.org/701894
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/sysklogd-2.0.3-no_parallel_build.patch | 40 ++++++++++++++++++++++
app-admin/sysklogd/sysklogd-2.0.3.ebuild | 11 +++++-
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch b/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch
new file mode 100644
index 00000000000..fa0f96ce2c8
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch
@@ -0,0 +1,40 @@
+From 9cf1f97cef04fed81c2407f7207795d7592ccb96 Mon Sep 17 00:00:00 2001
+From: Joachim Nilsson <troglobit@gmail.com>
+Date: Fri, 6 Dec 2019 18:19:05 +0100
+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>
+---
+ Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index c4cc80f..7e2b854 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:
diff --git a/app-admin/sysklogd/sysklogd-2.0.3.ebuild b/app-admin/sysklogd/sysklogd-2.0.3.ebuild
index 9ebf2a75013..be89e5f845c 100644
--- a/app-admin/sysklogd/sysklogd-2.0.3.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.0.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic systemd toolchain-funcs
+inherit autotools flag-o-matic systemd toolchain-funcs
DESCRIPTION="Standard log daemons"
HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
@@ -25,11 +25,20 @@ RDEPEND="${DEPEND}"
DOCS=( ChangeLog.md README.md )
+PATCHES=(
+ "${FILESDIR}"/${P}-no_parallel_build.patch #701894
+)
+
pkg_setup() {
append-lfs-flags
tc-export CC
}
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myeconfargs=(
--runstatedir="${EPREFIX}"/run
next reply other threads:[~2019-12-09 10:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 10:56 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-20 7:49 [gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/files/, app-admin/sysklogd/ Lars Wendler
2020-01-05 13:17 Lars Wendler
2019-12-02 9:23 Lars Wendler
2019-11-24 13:25 Lars Wendler
2019-11-20 10:15 Lars Wendler
2017-01-17 17:39 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1575888962.a195cb3f7ab35db9a071e70b513a893c998a02f7.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox