diff --git a/package/log4cxx/Config.in b/package/log4cxx/Config.in index 27a5f06988..d9daf27eb6 100644 --- a/package/log4cxx/Config.in +++ b/package/log4cxx/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LOG4CXX depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR # mbsinit depends on BR2_USE_MMU # apr depends on BR2_USE_WCHAR || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # boost depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # boost-thread @@ -21,9 +22,9 @@ config BR2_PACKAGE_LOG4CXX https://logging.apache.org/log4cxx/ -comment "log4cxx needs a toolchain w/ C++, threads, dynamic library" +comment "log4cxx needs a toolchain w/ C++, threads, dynamic library, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_USE_WCHAR depends on BR2_USE_MMU comment "log4cxx needs a toolchain w/ wchar or gcc >= 7" diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 728d49ee38..d9e9af18cf 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/logging/log4cxx/1.1.0/apache-log4cxx-1.1.0.tar.gz.sha512 -sha512 66a66eab933a6afd0779e3f73f65afa4fb82481208b591fd7c7c86ded805f50abcd9cdf954bdb49e1e7f5198e6c1c4fff8a7e180ff5fff9491f1946e9ba6fe2b apache-log4cxx-1.1.0.tar.gz +# From https://downloads.apache.org/logging/log4cxx/1.3.1/apache-log4cxx-1.3.1.tar.gz.sha512 +sha512 0956fd034fd1a98d2e48ed461578c1e85da02d176850a580195b6a60b959feaf402a2743cc84ccb5d467dd924ee46422b8a7b39d2be9ee131e4e275e65ba839c apache-log4cxx-1.3.1.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index 8024c96d46..2d8d57a612 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CXX_VERSION = 1.1.0 +LOG4CXX_VERSION = 1.3.1 LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES