mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 21:32:13 +02:00
sysklogd: fix parallel build problem
Parallel compile maybe failed with error: error: ../lib/strlcat.o: No such file or directory Makefile:619: recipe for target 'syslogd' failed remove previous patch, and backport lastest fix for this problem (From OE-Core rev: 6e5be1d240621c5ce2adf4e629bd6b240cefc0e3) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changqing Li
committed by
Richard Purdie
Richard Purdie
parent
8027ee1f21
commit
0aa056945b
@@ -0,0 +1,127 @@
|
||||
From 84d70e63fc105e3713943ed8c0bdd4e31a698226 Mon Sep 17
|
||||
00:00:00 2001 From: Joachim Nilsson <troglobit@gmail.com> Date: Thu, 16 Jan
|
||||
2020 22:16:51 +0100 Subject: [PATCH] Drop libcompat to simplify build deps
|
||||
and really fix
|
||||
|
||||
The original idea with libcompat was to keep as few objects as
|
||||
possible for linking with libsyslog. That in turn to prevent
|
||||
a user of libsyslog from suddenly also getting strong binding
|
||||
to symbols like strlcpy() from libsyslog, rather than their C
|
||||
library of choice.
|
||||
|
||||
However, this caused strlcpy.c to be built as both .o and .lo
|
||||
files, which in turn caused really bizarre build problems due
|
||||
to bad DAG dependency.
|
||||
|
||||
This patch drops libcompat and instead marks all replacement APIs
|
||||
as weak symbols, which a C library can override.
|
||||
|
||||
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
|
||||
|
||||
Upstream-Status: Backport
|
||||
[https://github.com/troglobit/sysklogd/commit/84d70e63fc105e3713943ed8c0bdd4e31a698226]
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
lib/pidfile.c | 8 +++++++-
|
||||
lib/utimensat.c | 10 ++++++++--
|
||||
src/Makefile.am | 7 +------
|
||||
3 files changed, 16 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/lib/pidfile.c b/lib/pidfile.c
|
||||
index 81f2315..25b1c04 100644
|
||||
--- a/lib/pidfile.c
|
||||
+++ b/lib/pidfile.c
|
||||
@@ -31,6 +31,9 @@
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
+#include <config.h>
|
||||
+#ifndef HAVE_PIDFILE
|
||||
+
|
||||
#define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */
|
||||
#include <sys/stat.h> /* utimensat() */
|
||||
#include <sys/time.h> /* utimensat() on *BSD */
|
||||
@@ -54,7 +57,7 @@ const char *__pidfile_path = RUNSTATEDIR;
|
||||
const char *__pidfile_name = NULL;
|
||||
|
||||
int
|
||||
-pidfile(const char *basename)
|
||||
+__pidfile(const char *basename)
|
||||
{
|
||||
int save_errno;
|
||||
int atexit_already;
|
||||
@@ -127,6 +130,9 @@ pidfile(const char *basename)
|
||||
return (0);
|
||||
}
|
||||
|
||||
+weak_alias(__pidfile, pidfile);
|
||||
+#endif /* HAVE_PIDFILE */
|
||||
+
|
||||
static void
|
||||
pidfile_cleanup(void)
|
||||
{
|
||||
diff --git a/lib/utimensat.c b/lib/utimensat.c
|
||||
index edf7e10..b68ce0e 100644
|
||||
--- a/lib/utimensat.c
|
||||
+++ b/lib/utimensat.c
|
||||
@@ -15,7 +15,8 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
-#include "config.h"
|
||||
+#include <config.h>
|
||||
+#ifndef HAVE_UTIMENSAT
|
||||
|
||||
#include <errno.h>
|
||||
#ifdef HAVE_FCNTL_H
|
||||
@@ -23,7 +24,8 @@
|
||||
#endif
|
||||
#include <sys/time.h> /* lutimes(), utimes(), utimensat() */
|
||||
|
||||
-int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags)
|
||||
+int
|
||||
+__utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags)
|
||||
{
|
||||
int ret = -1;
|
||||
struct timeval tv[2];
|
||||
@@ -45,3 +47,7 @@ int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int
|
||||
|
||||
return ret;
|
||||
}
|
||||
+
|
||||
+weak_alias(__utimensat, utimensat);
|
||||
+
|
||||
+#endif /* HAVE_UTIMENSAT */
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 6e2a51c..1db88d3 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -19,7 +19,6 @@
|
||||
bin_PROGRAMS =
|
||||
sbin_PROGRAMS = syslogd
|
||||
lib_LTLIBRARIES = libsyslog.la
|
||||
-noinst_LTLIBRARIES = libcompat.la
|
||||
|
||||
if ENABLE_KLOGD
|
||||
sbin_PROGRAMS += klogd
|
||||
@@ -48,10 +47,6 @@ logger_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600
|
||||
logger_LDADD = $(LIBS) $(LIBOBJS)
|
||||
logger_LDADD += libsyslog.la
|
||||
|
||||
-# Convenience library for libsyslog instead of linking with $(LTLIBOBJS),
|
||||
-# which would pull in pidfile() and other (strong) symbols as well.
|
||||
-libcompat_la_SOURCES = ../lib/strlcpy.c ../lib/strlcat.c
|
||||
-
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgincludedir = $(includedir)/syslog
|
||||
pkgconfig_DATA = libsyslog.pc
|
||||
@@ -59,4 +54,4 @@ pkginclude_HEADERS = syslog.h
|
||||
libsyslog_la_SOURCES = syslog.c syslog.h compat.h
|
||||
libsyslog_la_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600
|
||||
libsyslog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
|
||||
-libsyslog_la_LIBADD = libcompat.la
|
||||
+libsyslog_la_LIBADD = $(LTLIBOJBS)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -16,7 +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://0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch \
|
||||
file://sysklogd \
|
||||
"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user