From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7BD2A138334 for ; Mon, 9 Dec 2019 10:56:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B340E0845; Mon, 9 Dec 2019 10:56:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6840CE0845 for ; Mon, 9 Dec 2019 10:56:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91C0534D7A8 for ; Mon, 9 Dec 2019 10:56:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67B478A7 for ; Mon, 9 Dec 2019 10:56:09 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1575888962.a195cb3f7ab35db9a071e70b513a893c998a02f7.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/files/, app-admin/sysklogd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch app-admin/sysklogd/sysklogd-2.0.3.ebuild X-VCS-Directories: app-admin/sysklogd/files/ app-admin/sysklogd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a195cb3f7ab35db9a071e70b513a893c998a02f7 X-VCS-Branch: master Date: Mon, 9 Dec 2019 10:56:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7e204d21-93a4-448d-b108-5ac878e9166c X-Archives-Hash: 3ac27ce9c5d2283cd5a51796ea34db35 commit: a195cb3f7ab35db9a071e70b513a893c998a02f7 Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 9 10:55:38 2019 +0000 Commit: Lars Wendler gentoo 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 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 +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 +--- + 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