Skip to contentSkip to conversation

package/liblog4c-localtime: use numbered patches

PATCH New Bernd Kuhls 2 participants 5 messages Oct 19, 2014 – Oct 26, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/liblog4c-localtime: use numbered patches

Signed-off-by Bernd Kuhls <[email protected]>
---
 ...d-path.patch => liblog4c-0001-localtime-fix-underquoted-path.patch} |    0
 ...localtime-nothread.patch => liblog4c-0002-localtime-nothread.patch} |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/liblog4c-localtime/{liblog4c-localtime-fix-underquoted-path.patch => liblog4c-0001-localtime-fix-underquoted-path.patch} (100%)
 rename package/liblog4c-localtime/{liblog4c-localtime-nothread.patch => liblog4c-0002-localtime-nothread.patch} (100%)
package/liblog4c-localtime/liblog4c-0001-localtime-fix-underquoted-path.patch renamed from package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch +0 -0
similarity index 100%
rename from package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch
rename to package/liblog4c-localtime/liblog4c-0001-localtime-fix-underquoted-path.patch
package/liblog4c-localtime/liblog4c-0002-localtime-nothread.patch renamed from package/liblog4c-localtime/liblog4c-localtime-nothread.patch +0 -0
similarity index 100%
rename from package/liblog4c-localtime/liblog4c-localtime-nothread.patch
rename to package/liblog4c-localtime/liblog4c-0002-localtime-nothread.patch
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 package/liblog4c-localtime: Fix build with BR2_ENABLE_DEBUG=yes

Fixes
init.c:39:20: fatal error: mcheck.h: No such file or directory

Signed-off-by Bernd Kuhls <[email protected]>
---
 .../liblog4c-localtime/liblog4c-0003-debug.patch   |   37 ++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/liblog4c-localtime/liblog4c-0003-debug.patch
package/liblog4c-localtime/liblog4c-0003-debug.patch new file +37 -0
new file mode 100644
index 0000000..80b00cf
@@ -0,0 +1,37 @@
+Fix build with BR2_ENABLE_DEBUG=yes
+
+Fixes
+init.c:39:20: fatal error: mcheck.h: No such file or directory
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr log4c-localtime-1.0.org/src/log4c/init.c log4c-localtime-1.0/src/log4c/init.c
+--- log4c-localtime-1.0.org/src/log4c/init.c	2011-09-06 15:37:02.000000000 +0200
++++ log4c-localtime-1.0/src/log4c/init.c	2014-10-19 21:39:29.000000000 +0200
+@@ -35,7 +35,7 @@
+ #include <layout_type_basic_r.h>
+ #include <layout_type_dated_r.h>
+ 
+-#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__)
++#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__) && !defined(__UCLIBC__)
+ #include <mcheck.h>
+ #endif
+ 
+@@ -100,7 +100,7 @@
+     sd_debug("log4c_init[");
+   
+     /* activate GLIBC allocation debugging */
+-#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__)
++#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__) && !defined(__UCLIBC__)
+     mtrace();
+ #endif
+   
+@@ -278,7 +280,7 @@
+ 	log4c_dump_all_instances(stderr);
+     }
+ #endif
+-#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__)
++#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__) && !defined(__UCLIBC__)
+     muntrace();
+ #endif
+
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/2 package/liblog4c-localtime: Fix build with BR2_ENABLE_DEBUG=yes

Dear Bernd Kuhls,

package/liblog4c-localtime/liblog4c-0003-debug.patch line 6

Quoted 12 lines · Bernd Kuhls
package/liblog4c-localtime/liblog4c-0003-debug.patch new file +6 -0
new file mode 100644
index 0000000..80b00cf
@@ -0,0 +1,37 @@
+Fix build with BR2_ENABLE_DEBUG=yes
+
+Fixes
+init.c:39:20: fatal error: mcheck.h: No such file or directory
+
+Signed-off-by: Bernd Kuhls <[email protected]>

Same comment as for the other package: using AC_CHECK_HEADER([mcheck.h]) and then HAVE_MCHECK_H is a much better solution.

Do you think you can push upstream this patch as well as the other patches that we have?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 2/2 package/liblog4c-localtime: Fix build with BR2_ENABLE_DEBUG=yes

Bernd,

Quoted 6 lines · Thomas Petazzoni

Same comment as for the other package: using AC_CHECK_HEADER([mcheck.h]) and then HAVE_MCHECK_H is a much better solution.

Do you think you can push upstream this patch as well as the other patches that we have?

I've committed some patches against liblog4c-localtime to implement this, and I submitted them upstream. Therefore, I've marked your patch as Superseded. Thanks for spotting and analyzing the issue!

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Applied
#4 lore raw

PATCH 1/2 package/liblog4c-localtime: use numbered patches

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 8 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 ...d-path.patch => liblog4c-0001-localtime-fix-underquoted-path.patch} |    0
 ...localtime-nothread.patch => liblog4c-0002-localtime-nothread.patch} |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/liblog4c-localtime/{liblog4c-localtime-fix-underquoted-path.patch => liblog4c-0001-localtime-fix-underquoted-path.patch} (100%)
 rename package/liblog4c-localtime/{liblog4c-localtime-nothread.patch => liblog4c-0002-localtime-nothread.patch} (100%)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com