[log4cxx] Upgrade to 1.0.0 (#30914)

* [log4cxx] Update to 1.0.0

* [log4cxx] Update versions

* Remove redundent version

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update versions

---------

Co-authored-by: Stephen Webb <swebb2066@gmail.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
This commit is contained in:
Stephen Webb 2023-04-18 08:39:22 +10:00 committed by GitHub
parent acbf376ab2
commit 2507e0e707
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 55 deletions

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4b96376..8b966872 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ find_package(APR-Util REQUIRED)
find_package( Threads REQUIRED )
# Find expat for XML parsing
-find_package(EXPAT REQUIRED)
+find_package(expat CONFIG REQUIRED)
if(TARGET EXPAT::EXPAT)
set(EXPAT_LIBRARIES EXPAT::EXPAT)
elseif(TARGET expat::expat)

View File

@ -1,17 +0,0 @@
diff --git a/src/cmake/FindAPR.cmake b/src/cmake/FindAPR.cmake
index a204ece..4d2b48d 100644
--- a/src/cmake/FindAPR.cmake
+++ b/src/cmake/FindAPR.cmake
@@ -45,7 +45,11 @@ if(EXISTS ${APR_CONFIG_EXECUTABLE})
else()
find_path(APR_INCLUDE_DIR apr.h PATH_SUFFIXES apr-1)
if (APR_STATIC OR NOT BUILD_SHARED_LIBS)
- set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4)
+ if(WIN32)
+ set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4)
+ else()
+ set(APR_SYSTEM_LIBS pthread)
+ endif()
set(APR_COMPILE_DEFINITIONS APR_DECLARE_STATIC)
find_library(APR_LIBRARIES NAMES apr-1)
else()

View File

@ -1,16 +1,11 @@
set(VERSION 0.13.0)
vcpkg_download_distfile(ARCHIVE
URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz"
FILENAME "apache-log4cxx-${VERSION}.tar.gz"
SHA512 2a5f4fecc0415d942658c588774f0666082c497b6fd49bf64ab3328a997775206788c9b10a8c89208896c57da52fcc12c18d5d11ca1d3bf699e4633b8fcea6e5
SHA512 a6b928d7b5b4fb60a67504be082f436a6d1a750b752a89df51d0660670b6c008e7376cf56c1749fd5fc17777ae8a2d957f72879c9a89487ecb0f179999dc1283
)
vcpkg_extract_source_archive(
SOURCE_PATH ARCHIVE "${ARCHIVE}"
PATCHES
expat.patch
threadutility.patch
linux.patch
)
vcpkg_cmake_configure(

View File

@ -1,17 +0,0 @@
diff --git a/src/main/cpp/threadutility.cpp b/src/main/cpp/threadutility.cpp
index b57ab66b..c14c12fd 100644
--- a/src/main/cpp/threadutility.cpp
+++ b/src/main/cpp/threadutility.cpp
@@ -16,8 +16,11 @@
*/
#include "log4cxx/helpers/threadutility.h"
-#include "log4cxx/private/log4cxx_private.h"
#include "log4cxx/helpers/loglog.h"
+#if !defined(LOG4CXX)
+ #define LOG4CXX 1
+#endif
+#include "log4cxx/private/log4cxx_private.h"
#include <signal.h>
#include <mutex>

View File

@ -1,6 +1,6 @@
{
"name": "log4cxx",
"version": "0.13.0.1",
"version": "1.0.0",
"description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR",
"homepage": "https://logging.apache.org/log4cxx",
"license": "Apache-2.0",

View File

@ -4885,7 +4885,7 @@
"port-version": 8
},
"log4cxx": {
"baseline": "0.13.0.1",
"baseline": "1.0.0",
"port-version": 0
},
"loguru": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3f8391924df847ec08d25424cb7482be557c3d49",
"version": "1.0.0",
"port-version": 0
},
{
"git-tree": "65dd3e2c021462bc3445c9f215ace6936a177bb6",
"version": "0.13.0.1",