mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

sysklogd: fix one parallel build error

Browse Source 
(From OE-Core rev: 8e61e5ec230c36dbe1f2517d17fc88494455a5d0)

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
2020-03-23 16:03:07 +08:00
committed by Richard Purdie
parent e4b609e5c1
commit 19c8e88cb4
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/sysklogd/files/0001-fix-one-rarely-reproduced-parallel-build-problem.patch
+40
View File
@@ -0,0 +1,40 @@
From dcaa75391ff267c38e776d48c579cdb734b91af3 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 23 Mar 2020 15:52:32 +0800
Subject: [PATCH] fix one rarely reproduced parallel build problem
fix for this issue:
https://github.com/troglobit/sysklogd/issues/17
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Upstream-Status: Backport
[https://github.com/troglobit/sysklogd/commit/b88e21d1770a262f0e5d0f6b84f0abd4a5de55b7]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
src/Makefile.am | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/Makefile.am b/src/Makefile.am
index 993dbfd..06b706d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,3 +56,13 @@ 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 = $(LTLIBOBJS)
+
+# Both libsyslog_la and syslogd/logger requires objects like lib/pidfile.o, for
+# # libsyslog_la, the objects should be compiled with -fPIC, but for
+# # syslogd/logger, it doesn't need -fPIC, so there is a race issue when the two
+# # different lib/pidfile.o are compiled at the same time, which would cause errors like:
+# # ld: syslogd-syslogd.o: in function `main':
+# # syslogd.c:417: undefined reference to `__pidfile'
+# #
+# # Make LIBOBJS depend on LTLIBOBJS to fix the problem.
+# $(LIBOBJS): $(LTLIBOBJS)
--
2.7.4
meta/recipes-extended/sysklogd/sysklogd.inc
+1
View File
@@ -12,6 +12,7 @@ inherit update-rc.d update-alternatives systemd autotools
SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
file://sysklogd \
file://0001-fix-one-rarely-reproduced-parallel-build-problem.patch \
"
S = "${WORKDIR}/git"