From e75ff6818aefa8e32c2314a541310844fa4880a4 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Thu, 2 Jan 2020 10:07:27 +0100 Subject: log4cplus: update to 2.0.5 Update log4cplus library to 2019-12-23 released version containing (relevant for *nix) * Modernized CMake build. * Fix issue with std::va_list value reuse. * Fix parsing of include in configuration when included file path contains =. (Patch by Peter Pei) * Change of default behaviour: Instantiate thread pool with only 4 threads Signed-off-by: Jens Rehsack Signed-off-by: Khem Raj --- ...cplus-version-entry-from-ELF-.comment-sec.patch | 40 ---------------------- .../recipes-devtools/log4cplus/log4cplus_2.0.4.bb | 20 ----------- .../recipes-devtools/log4cplus/log4cplus_2.0.5.bb | 19 ++++++++++ 3 files changed, 19 insertions(+), 60 deletions(-) delete mode 100644 meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch delete mode 100644 meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb create mode 100644 meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch b/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch deleted file mode 100644 index 44a835c35f..0000000000 --- a/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch +++ /dev/null @@ -1,40 +0,0 @@ -From da5338e68f146efadab7c221291ba4c949d8f12f Mon Sep 17 00:00:00 2001 -From: Vaclav Haisman -Date: Sun, 21 Jul 2019 23:23:16 -0700 -Subject: [PATCH] Remove log4cplus version entry from ELF .comment section - -Reverts -https://github.com/log4cplus/log4cplus/commit/9cb0d4ade619da4e40628c9b95ff51de3df29f1b - -Upstream-Status: Backport [https://github.com/log4cplus/log4cplus/commit/7e6addc70dffd2e30e902efd18eb845c5d5dd7bb] - -Suggested-by: Adrian Bunk -Signed-off-by: Khem Raj ---- - src/version.cxx | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/src/version.cxx b/src/version.cxx -index ce18212..e002de9 100644 ---- a/src/version.cxx -+++ b/src/version.cxx -@@ -34,16 +34,4 @@ namespace log4cplus - unsigned const version = LOG4CPLUS_VERSION; - char const versionStr[] = LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; - --namespace --{ -- --#if defined (__ELF__) && (defined (__GNUC__) || defined (__clang__)) --char const versionStrComment[] -- __attribute__ ((__used__, __section__ ((".comment")))) -- = "log4cplus " LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; --#endif -- -- --} // namespace -- - } // namespace log4cplus --- -2.22.0 - diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb deleted file mode 100644 index 566de28535..0000000000 --- a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "log4cplus provides a simple C++ logging API for log management" -SECTION = "libs" -HOMEPAGE = "http://sourceforge.net/projects/log4cplus/" -BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/" - -LICENSE = "Apache-2.0 & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \ - file://0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch \ - " -SRC_URI[md5sum] = "2b5b7bc294698bf30a315a259ef9eec2" -SRC_URI[sha256sum] = "196eedbc7f2dd792dae721b1159c7ac132255bb368226353c24d4d5fa7c7797a" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/" -UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb new file mode 100644 index 0000000000..967ac7623a --- /dev/null +++ b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "log4cplus provides a simple C++ logging API for log management" +SECTION = "libs" +HOMEPAGE = "http://sourceforge.net/projects/log4cplus/" +BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/" + +LICENSE = "Apache-2.0 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \ + " +SRC_URI[md5sum] = "71dd956bf686195127559671f1426cff" +SRC_URI[sha256sum] = "c07115c23219390633798def30b7b51a0f79fdeb857e4b49632f17746d0ceb97" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/" +UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg