From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sun, 19 Oct 2014 19:49:24 +0000 (+0200)
Subject: package/liblog4c-localtime: use numbered patches
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=27e143a62686fac6959559d4dfc125102adfc934;p=buildroot.git

package/liblog4c-localtime: use numbered patches

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/liblog4c-localtime/liblog4c-0001-localtime-fix-underquoted-path.patch b/package/liblog4c-localtime/liblog4c-0001-localtime-fix-underquoted-path.patch
new file mode 100644
index 0000000000..8a74a5efd9
--- /dev/null
+++ b/package/liblog4c-localtime/liblog4c-0001-localtime-fix-underquoted-path.patch
@@ -0,0 +1,16 @@
+Fix "underquoted definition of AM_PATH_LOG4C" warning.
+
+Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> 
+
+diff -urN liblog4c-localtime-1.0/log4c.m4 liblog4c-localtime-1.0.orig/log4c.m4
+--- liblog4c-localtime-1.0/log4c.m4	2012-10-27 16:11:46.219894716 -0400
++++ liblog4c-localtime-1.0.orig/log4c.m4	2012-10-27 16:10:31.393336864 -0400
+@@ -4,7 +4,7 @@
+ dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_LOG4C,
++AC_DEFUN([AM_PATH_LOG4C],
+ [dnl 
+ dnl Get the cflags and libraries from the log4c-config script
+ dnl
diff --git a/package/liblog4c-localtime/liblog4c-0002-localtime-nothread.patch b/package/liblog4c-localtime/liblog4c-0002-localtime-nothread.patch
new file mode 100644
index 0000000000..df16e62461
--- /dev/null
+++ b/package/liblog4c-localtime/liblog4c-0002-localtime-nothread.patch
@@ -0,0 +1,29 @@
+[PATCH] fix linking error without pthread
+
+The rollingfile functionality only gets built if pthread support is
+available, but a call to these functions from log4c_fini() was outside
+the #if WITH_ROLLINGFILE conditional, causing linker errors when the
+library is used.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ src/log4c/init.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: liblog4c-localtime-v1.0/src/log4c/init.c
+===================================================================
+--- liblog4c-localtime-v1.0.orig/src/log4c/init.c
++++ liblog4c-localtime-v1.0/src/log4c/init.c
+@@ -267,10 +267,12 @@
+ 	log4c_layout_factory = NULL;
+     }
+   
++#ifdef WITH_ROLLINGFILE
+     if (log4c_rollingpolicy_factory) {
+ 	sd_factory_delete(log4c_rollingpolicy_factory);
+ 	log4c_rollingpolicy_factory = NULL;
+     }
++#endif
+     
+ #ifdef __SD_DEBUG__
+     if( getenv("SD_DEBUG")){
diff --git a/package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch b/package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch
deleted file mode 100644
index 8a74a5efd9..0000000000
--- a/package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix "underquoted definition of AM_PATH_LOG4C" warning.
-
-Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> 
-
-diff -urN liblog4c-localtime-1.0/log4c.m4 liblog4c-localtime-1.0.orig/log4c.m4
---- liblog4c-localtime-1.0/log4c.m4	2012-10-27 16:11:46.219894716 -0400
-+++ liblog4c-localtime-1.0.orig/log4c.m4	2012-10-27 16:10:31.393336864 -0400
-@@ -4,7 +4,7 @@
- dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS
- dnl
--AC_DEFUN(AM_PATH_LOG4C,
-+AC_DEFUN([AM_PATH_LOG4C],
- [dnl 
- dnl Get the cflags and libraries from the log4c-config script
- dnl
diff --git a/package/liblog4c-localtime/liblog4c-localtime-nothread.patch b/package/liblog4c-localtime/liblog4c-localtime-nothread.patch
deleted file mode 100644
index df16e62461..0000000000
--- a/package/liblog4c-localtime/liblog4c-localtime-nothread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-[PATCH] fix linking error without pthread
-
-The rollingfile functionality only gets built if pthread support is
-available, but a call to these functions from log4c_fini() was outside
-the #if WITH_ROLLINGFILE conditional, causing linker errors when the
-library is used.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/log4c/init.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: liblog4c-localtime-v1.0/src/log4c/init.c
-===================================================================
---- liblog4c-localtime-v1.0.orig/src/log4c/init.c
-+++ liblog4c-localtime-v1.0/src/log4c/init.c
-@@ -267,10 +267,12 @@
- 	log4c_layout_factory = NULL;
-     }
-   
-+#ifdef WITH_ROLLINGFILE
-     if (log4c_rollingpolicy_factory) {
- 	sd_factory_delete(log4c_rollingpolicy_factory);
- 	log4c_rollingpolicy_factory = NULL;
-     }
-+#endif
-     
- #ifdef __SD_DEBUG__
-     if( getenv("SD_DEBUG")){