1From 435b28cd90973cc03a533e75e90a46cd9f197dff Mon Sep 17 00:00:00 2001 2From: Peter Korsgaard <peter@korsgaard.com> 3Date: Sat, 25 Oct 2014 19:44:01 +0200 4Subject: [PATCH 2/5] Fix linking error without pthread 5 6The rollingfile functionality only gets built if pthread support is 7available, but a call to these functions from log4c_fini() was outside 8the #if WITH_ROLLINGFILE conditional, causing linker errors when the 9library is used. 10 11Submitted upstream: https://github.com/rcmadruga/log4c-localtime/pull/1 12 13Signed-off-by: Peter Korsgaard <peter@korsgaard.com> 14Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 15--- 16 src/log4c/init.c | 2 ++ 17 1 file changed, 2 insertions(+) 18 19diff --git a/src/log4c/init.c b/src/log4c/init.c 20index 99883ea..7dd9eb4 100644 21--- a/src/log4c/init.c 22+++ b/src/log4c/init.c 23@@ -267,10 +267,12 @@ extern int log4c_fini(void) 24 log4c_layout_factory = NULL; 25 } 26 27+#ifdef WITH_ROLLINGFILE 28 if (log4c_rollingpolicy_factory) { 29 sd_factory_delete(log4c_rollingpolicy_factory); 30 log4c_rollingpolicy_factory = NULL; 31 } 32+#endif 33 34 #ifdef __SD_DEBUG__ 35 if( getenv("SD_DEBUG")){ 36-- 372.0.0 38 39