Skip to contentSkip to conversation

log4cpp: Added recipe for log4cpp

PATCH In review Camille Moncelier 2 participants 6 messages Nov 6, 2010 – Nov 17, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 8/11 log4cpp: Added recipe for log4cpp

* Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.

---
 .../log4cpp/log4cpp-1.0/configure_pkgconfig.diff   |   11 +++++++++
 recipes/log4cpp/log4cpp-1.0/stl_compile.diff       |   23 ++++++++++++++++++++
 recipes/log4cpp/log4cpp_1.0.bb                     |   22 +++++++++++++++++++
 3 files changed, 56 insertions(+), 0 deletions(-)
 create mode 100644 recipes/log4cpp/log4cpp-1.0/configure_pkgconfig.diff
 create mode 100644 recipes/log4cpp/log4cpp-1.0/stl_compile.diff
 create mode 100644 recipes/log4cpp/log4cpp_1.0.bb
recipes/log4cpp/log4cpp-1.0/configure_pkgconfig.diff new file +11 -0
new file mode 100644
index 0000000..e4a9104
@@ -0,0 +1,11 @@
+--- log4cpp-1.0/m4/ac_config_pkgconfig_in.m4	2004-01-27 11:27:38.000000000 +0100
++++ log4cpp-1.0.patched/m4/ac_config_pkgconfig_in.m4	2009-08-24 17:12:26.000000000 +0200
+@@ -121,7 +121,7 @@
+ fi
+ echo 'Version: @VERSION@' >>$PKGCONFIG_FILE
+ echo 'Libs: -L${libdir} @MODULE_DOWN[]_libs@' >>$PKGCONFIG_FILE
+-echo 'Cflags: -I${includedir} @MODULE_DOWN[]_cflags@' >>$PKGCONFIG_FILE
++echo 'Cflags: -I${includedir}' >>$PKGCONFIG_FILE
+ m4_pushdef([PKGCONFIG_UP], [m4_translit([$1], [a-z], [A-Z])])dnl
+ PKGCONFIG_UP[]_PKGCONFIG="PKGCONFIG_DIR[]$1-config"
+ AC_SUBST(PKGCONFIG_UP[]_PKGCONFIG)
recipes/log4cpp/log4cpp-1.0/stl_compile.diff new file +23 -0
new file mode 100644
index 0000000..dc4672d
@@ -0,0 +1,23 @@
+diff -r -u log4cpp-1.0/src/BasicLayout.cpp log4cpp-1.0.new/src/BasicLayout.cpp
+--- log4cpp-1.0/src/BasicLayout.cpp	2006-09-30 08:03:20.000000000 +0200
++++ log4cpp-1.0.new/src/BasicLayout.cpp	2009-08-21 16:13:32.000000000 +0200
+@@ -14,6 +14,7 @@
+ #ifdef LOG4CPP_HAVE_SSTREAM
+ #include <sstream>
+ #endif
++#include <memory>
+
+ namespace log4cpp {
+
+diff -r -u log4cpp-1.0/src/PatternLayout.cpp log4cpp-1.0.new/src/PatternLayout.cpp
+--- log4cpp-1.0/src/PatternLayout.cpp	2007-08-28 09:54:12.000000000 +0200
++++ log4cpp-1.0.new/src/PatternLayout.cpp	2009-08-21 16:14:04.000000000 +0200
+@@ -370,7 +370,7 @@
+                         literal = "";
+                     }
+                     if ((minWidth != 0) || (maxWidth != 0)) {
+-                        component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0);
++                        component = new FormatModifierComponent(component, std::abs((double)minWidth), maxWidth, minWidth < 0);
+                         minWidth = maxWidth = 0;
+                     }
+                     _components.push_back(component);
recipes/log4cpp/log4cpp_1.0.bb new file +22 -0
new file mode 100644
index 0000000..0243e16
@@ -0,0 +1,22 @@
+DESCRIPTION = "A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations."
+HOMEPAGE = "http://sourceforge.net/projects/log4cpp/"
+PRIORITY = "optional"
+PR = "r3"
+
+SRC_URI = " \
+     http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.0.x%20%28current%29/${PN}-${PV}/${PN}-${PV}.tar.gz \
+     file://stl_compile.diff;apply=yes \
+     file://configure_pkgconfig.diff;apply=yes \
+"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+    --enable-doxygen=no \
+    --enable-dot=no \
+    --enable-html-docs=no \
+    --enable-latex-docs=no \
+"
+
+SRC_URI[md5sum] = "1face50ead0790d1297dfb04bacf273c"
+SRC_URI[sha256sum] = "b4533324b0a1f46ad74a9e92bf2caa46c246e9353059e1a835e735d41826ed19"
Signature · 1 line
1.7.3.1
#1 lore raw

PATCH 2/11 dropbear: Removed openmoko references. Added /etc/default/dropbear

---
 recipes/dropbear/dropbear.inc     |    4 +---
 recipes/dropbear/dropbear/default |    4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 recipes/dropbear/dropbear/default
recipes/dropbear/dropbear.inc +1 -3
index 1569ea3..db1b26e 100644
@@ -15,8 +15,6 @@ SRC_URI = "\
   file://fix-2kb-keys.patch \
   file://allow-nopw.patch;apply=no \
   file://init \
-"
-SRC_URI_append_openmoko = "\
   file://default \
 "
 
@@ -82,4 +80,4 @@ pkg_postrm_append () {
 	update-alternatives --remove scp ${bindir}/dropbearmulti
 }
 
-CONFFILES_${PN}_openmoko += "${sysconfdir}/default/dropbear"
+CONFFILES_${PN} += "${sysconfdir}/default/dropbear"
recipes/dropbear/dropbear/default new file +4 -0
new file mode 100644
index 0000000..a4f2bfd
@@ -0,0 +1,4 @@
+# DROPBEAR_BANNER=""
+# DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
+# DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"
+# DROPBEAR_KEYTYPES="rsa"
Signature · 1 line
1.7.3.1
#2 lore raw

Re: [PATCH 02/11] dropbear: Removed openmoko references. Added /etc/default/dropbear

Quoted 32 lines · Camille Moncelier

---
 recipes/dropbear/dropbear.inc     |    4 +---
 recipes/dropbear/dropbear/default |    4 ++++

 2 files changed, 5 insertions(+), 3 deletions(-)

 create mode 100644 recipes/dropbear/dropbear/default

recipes/dropbear/dropbear.inc +0 -2
index 1569ea3..db1b26e 100644
@@ -15,8 +15,6 @@ SRC_URI = "\
   file://fix-2kb-keys.patch \
   file://allow-nopw.patch;apply=no \
   file://init \
-"
-SRC_URI_append_openmoko = "\
   file://default \

 "

recipes/dropbear/dropbear.inc +0 -0
@@ -82,4 +80,4 @@ pkg_postrm_append () {

       update-alternatives --remove scp ${bindir}/dropbearmulti }

recipes/dropbear/dropbear.inc +1 -1
-CONFFILES_${PN}_openmoko += "${sysconfdir}/default/dropbear"
+CONFFILES_${PN} += "${sysconfdir}/default/dropbear"
recipes/dropbear/dropbear/default new file +0 -0
new file mode 100644
index 0000000..a4f2bfd

recipes/dropbear/dropbear/default line 3

Quoted 3 lines
recipes/dropbear/dropbear/default new file +3 -0
@@ -0,0 +1,4 @@
+# DROPBEAR_BANNER=""
+# DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
+# DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"
        ^^^

should this be dsa ?

Quoted 10 lines
recipes/dropbear/dropbear/default new file +1 -1
+# DROPBEAR_KEYTYPES="rsa"
--

1.7.3.1

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#3 lore raw

Re: [PATCH 02/11] dropbear: Removed openmoko references. Added /etc/default/dropbear

Quoted 12 lines · Khem Raj
recipes/dropbear/dropbear/default +0 -0

recipes/dropbear/dropbear/default line 3

Quoted 8 lines

new file mode 100644
index 0000000..a4f2bfd

recipes/dropbear/dropbear/default new file +3 -0
@@ -0,0 +1,4 @@
+# DROPBEAR_BANNER=""
+# DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
+# DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"
       ^^^
Quoted 1 line

should this be dsa ?

Nope, it's DSS . You can look in recipes/dropbear/dropbear/init, dropbearkey use dss for its key type.

Signature · 5 lines
Camille Moncelier
http://devlife.org/

If Java had true garbage collection, most programs would
delete themselves upon execution.
#4 lore raw

Re: [PATCH 02/11] dropbear: Removed openmoko references. Added /etc/default/dropbear

Quoted 17 lines · Camille Moncelier
Quoted 14 lines · Khem Raj

recipes/dropbear/dropbear/default line 3

Quoted 11 lines
recipes/dropbear/dropbear/default new file +3 -0
new file mode 100644
index 0000000..a4f2bfd
@@ -0,0 +1,4 @@
+# DROPBEAR_BANNER=""
+# DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
+# DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"

       ^^^
should this be dsa ?

Quoted 2 lines

Nope, it's DSS . You can look in recipes/dropbear/dropbear/init, dropbearkey use dss for its key type.

interesting. It almost looks like a typo

Quoted 6 lines

--
Camille Moncelier
http://devlife.org/

If Java had true garbage collection, most programs would delete themselves upon execution.

#5 lore raw
In reply to Camille Moncelier
Quoted 66 lines · Camille Moncelier

 * Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.

---
 .../log4cpp/log4cpp-1.0/configure_pkgconfig.diff   |   11 +++++++++ recipes/log4cpp/log4cpp-1.0/stl_compile.diff       |   23 ++++++++++++++++++++ recipes/log4cpp/log4cpp_1.0.bb                     |   22 +++++++++++++++++++

 3 files changed, 56 insertions(+), 0 deletions(-)

 create mode 100644 recipes/log4cpp/log4cpp-1.0/configure_pkgconfig.diff create mode 100644 recipes/log4cpp/log4cpp-1.0/stl_compile.diff create mode 100644 recipes/log4cpp/log4cpp_1.0.bb

recipes/log4cpp/log4cpp-1.0/configure_pkgconfig.diff new file +11 -0
new file mode 100644
index 0000000..e4a9104
@@ -0,0 +1,11 @@
+--- log4cpp-1.0/m4/ac_config_pkgconfig_in.m4   2004-01-27 11:27:38.000000000 +0100
++++ log4cpp-1.0.patched/m4/ac_config_pkgconfig_in.m4   2009-08-24 17:12:26.000000000 +0200
+@@ -121,7 +121,7 @@
+ fi
+ echo 'Version: @VERSION@' >>$PKGCONFIG_FILE
+ echo 'Libs: -L${libdir} @MODULE_DOWN[]_libs@' >>$PKGCONFIG_FILE
+-echo 'Cflags: -I${includedir} @MODULE_DOWN[]_cflags@' >>$PKGCONFIG_FILE
++echo 'Cflags: -I${includedir}' >>$PKGCONFIG_FILE
+ m4_pushdef([PKGCONFIG_UP], [m4_translit([$1], [a-z], [A-Z])])dnl
+ PKGCONFIG_UP[]_PKGCONFIG="PKGCONFIG_DIR[]$1-config"
+ AC_SUBST(PKGCONFIG_UP[]_PKGCONFIG)
recipes/log4cpp/log4cpp-1.0/stl_compile.diff new file +23 -0
new file mode 100644
index 0000000..dc4672d
@@ -0,0 +1,23 @@
+diff -r -u log4cpp-1.0/src/BasicLayout.cpp log4cpp-1.0.new/src/BasicLayout.cpp
+--- log4cpp-1.0/src/BasicLayout.cpp    2006-09-30 08:03:20.000000000 +0200
++++ log4cpp-1.0.new/src/BasicLayout.cpp        2009-08-21 16:13:32.000000000 +0200
+@@ -14,6 +14,7 @@
+ #ifdef LOG4CPP_HAVE_SSTREAM
+ #include <sstream>
+ #endif
++#include <memory>
+
+ namespace log4cpp {
+
+diff -r -u log4cpp-1.0/src/PatternLayout.cpp log4cpp-1.0.new/src/PatternLayout.cpp
+--- log4cpp-1.0/src/PatternLayout.cpp  2007-08-28 09:54:12.000000000 +0200
++++ log4cpp-1.0.new/src/PatternLayout.cpp      2009-08-21 16:14:04.000000000 +0200
+@@ -370,7 +370,7 @@
+                         literal = "";
+                     }
+                     if ((minWidth != 0) || (maxWidth != 0)) {
+-                        component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0);
++                        component = new FormatModifierComponent(component, std::abs((double)minWidth), maxWidth, minWidth < 0);
+                         minWidth = maxWidth = 0;
+                     }
+                     _components.push_back(component);
recipes/log4cpp/log4cpp_1.0.bb new file +0 -0
new file mode 100644
index 0000000..0243e16

recipes/log4cpp/log4cpp_1.0.bb line 4

Quoted 4 lines
recipes/log4cpp/log4cpp_1.0.bb new file +4 -0
@@ -0,0 +1,22 @@
+DESCRIPTION = "A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations."
+HOMEPAGE = "http://sourceforge.net/projects/log4cpp/"
+PRIORITY = "optional"
+PR = "r3"

initially you set it to r0
and
what LICENSE does it have ?

recipes/log4cpp/log4cpp_1.0.bb line 10

Quoted 6 lines
recipes/log4cpp/log4cpp_1.0.bb new file +6 -0
+
+SRC_URI = " \
+     http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.0.x%20%28current%29/${PN}-${PV}/${PN}-${PV}.tar.gz \
+     file://stl_compile.diff;apply=yes \
+     file://configure_pkgconfig.diff;apply=yes \
+"

you dont need apply=yes patching code will figure it out.

Quoted 21 lines
recipes/log4cpp/log4cpp_1.0.bb new file +12 -1
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+    --enable-doxygen=no \
+    --enable-dot=no \
+    --enable-html-docs=no \
+    --enable-latex-docs=no \
+"
+
+SRC_URI[md5sum] = "1face50ead0790d1297dfb04bacf273c"
+SRC_URI[sha256sum] = "b4533324b0a1f46ad74a9e92bf2caa46c246e9353059e1a835e735d41826ed19"
--

1.7.3.1

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel