diff --git a/package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch b/package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch deleted file mode 100644 index 7df29ea120..0000000000 --- a/package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 24e7adc8d67b3c8f7d275b4f9a7e70a61b73fcd4 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 28 Jan 2022 13:11:01 +0100 -Subject: [PATCH] boost-fallback: only check for boost if really needed - -- only check for boost if really needed (in case of legacy c++ standard < c++17) - -Signed-off-by: Peter Seiderer ---- - src/cmake/boost-fallback/boost-fallback.cmake | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake -index 8285b0b9..0ecf8c6c 100644 ---- a/src/cmake/boost-fallback/boost-fallback.cmake -+++ b/src/cmake/boost-fallback/boost-fallback.cmake -@@ -55,6 +55,8 @@ try_compile(STD_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tes - try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" - "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp") - -+# search for boost only in case needed for legacy c++ standard < c++17 -+if(NOT ${STD_THREAD_FOUND} OR NOT ${STD_MUTEX_FOUND} OR NOT ${STD_SHARED_MUTEX_FOUND} OR NOT ${STD_SHARED_PTR_FOUND} OR NOT ${STD_ATOMIC_FOUND}) - find_package(Boost COMPONENTS thread) - if( ${Boost_FOUND} ) - try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -@@ -67,6 +69,7 @@ if( ${Boost_FOUND} ) - try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" - "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") - endif( ${Boost_FOUND} ) -+endif() - - # Link the target with the appropriate boost libraries(if required) - function(boostfallback_link target) --- -2.34.1 - diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 12633c8e57..8190f94aa3 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/logging/log4cxx/0.12.1/apache-log4cxx-0.12.1.tar.gz.sha512 -sha512 807058734cebf7c92e99484313becbc6be63e48bd930889c733318bb78dfec498b66aaa12255ed30879abb005b32e2b965f9dd87ec50d0421ca067f3f66280d9 apache-log4cxx-0.12.1.tar.gz +# From https://www.apache.org/dist/logging/log4cxx/0.13.0/apache-log4cxx-0.13.0.tar.gz.sha512 +sha512 2a5f4fecc0415d942658c588774f0666082c497b6fd49bf64ab3328a997775206788c9b10a8c89208896c57da52fcc12c18d5d11ca1d3bf699e4633b8fcea6e5 apache-log4cxx-0.13.0.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index d20cc792a6..f50267d737 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CXX_VERSION = 0.12.1 +LOG4CXX_VERSION = 0.13.0 LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES