• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch
Thomas PetazzoniThomas Petazzoni committed 525a94acc3526 Oct 2014
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
From 435b28cd90973cc03a533e75e90a46cd9f197dff Mon Sep 17 00:00:00 2001
2
From: Peter Korsgaard <peter@korsgaard.com>
3
Date: Sat, 25 Oct 2014 19:44:01 +0200
4
Subject: [PATCH 2/5] Fix linking error without pthread
5
​
6
The rollingfile functionality only gets built if pthread support is
7
available, but a call to these functions from log4c_fini() was outside
8
the #if WITH_ROLLINGFILE conditional, causing linker errors when the
9
library is used.
10
​
11
Submitted upstream: https://github.com/rcmadruga/log4c-localtime/pull/1
12
​
13
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
14
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
15
---
16
 src/log4c/init.c | 2 ++
17
 1 file changed, 2 insertions(+)
18
​
19
diff --git a/src/log4c/init.c b/src/log4c/init.c
20
index 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
-- 
37
2.0.0
38
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.