[log4cpp-log4cpp] Update to 1.1.5 (#49129)

2026-01-18 01:11:23 +01:00 · 2025-12-31 00:59:36 +01:00
parent 0e6cad2671
commit 1f1a8aeaca
6 changed files with 109 additions and 87 deletions
--- a/ports/log4cpp-log4cpp/cmake_fix.patch
+++ b/ports/log4cpp-log4cpp/cmake_fix.patch
@@ -0,0 +1,66 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1075142..f6f44db 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -102,16 +102,19 @@ ENDIF()
+ 
+ MESSAGE("LOG4CPP_BUILD_SHARED is ${LOG4CPP_BUILD_SHARED}; LOG4CPP_BUILD_STATIC is ${LOG4CPP_BUILD_STATIC}")
+ 
+set(LOG4CPP_INSTALL_TARGETS)
+ IF (LOG4CPP_BUILD_STATIC)
+   ADD_LIBRARY ( LOG4CPP_STATIC STATIC ${LOG4CPP_LIBRARY_SOURCES} )
+   IF (WIN32)
+     # win will also build small .lib even when shared library is requested, this is to avoid name clash
+     SET_TARGET_PROPERTIES( LOG4CPP_STATIC PROPERTIES OUTPUT_NAME ${LOG4CPP_LIBRARY_NAME}_static )
+    TARGET_LINK_LIBRARIES ( LOG4CPP_STATIC PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+   ELSE()
+     SET_TARGET_PROPERTIES( LOG4CPP_STATIC PROPERTIES OUTPUT_NAME ${LOG4CPP_LIBRARY_NAME} )
+   ENDIF()
+   TARGET_COMPILE_DEFINITIONS ( LOG4CPP_STATIC PRIVATE $<$<CONFIG:Debug>:_DEBUG DEBUG LOG4CPP_FIX_ERROR_COLLISION> )
+   TARGET_COMPILE_DEFINITIONS ( LOG4CPP_STATIC PRIVATE $<$<CONFIG:Release>:NDEBUG> )
+  LIST(APPEND LOG4CPP_INSTALL_TARGETS LOG4CPP_STATIC)
+ ENDIF (LOG4CPP_BUILD_STATIC)
+ 
+ IF (LOG4CPP_BUILD_SHARED)
+@@ -121,24 +124,11 @@ IF (LOG4CPP_BUILD_SHARED)
+   TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE $<$<CONFIG:Release>:NDEBUG> )
+   IF (WIN32)
+     TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
+    TARGET_LINK_LIBRARIES ( LOG4CPP_SHARED PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+   ENDIF (WIN32)
+  LIST(APPEND LOG4CPP_INSTALL_TARGETS LOG4CPP_SHARED)
+ ENDIF (LOG4CPP_BUILD_SHARED)
+ 
+-IF (WIN32)
+-  # RAD Studio specifics
+-  IF (CMAKE_CXX_COMPILER MATCHES ".*bcc32c.*" OR CMAKE_CXX_COMPILER MATCHES ".*bcc64x.*")
+-    MESSAGE(STATUS "Embarcadero C++Builder detected")
+-    SET ( WIN_DEBUG_POSTFIX "" )
+-    SET_EMBT_TARGET( LOG4CPP_STATIC RTL )
+-    SET_EMBT_TARGET( LOG4CPP_SHARED RTL )
+-  ENDIF()
+-  
+-  TARGET_LINK_LIBRARIES ( LOG4CPP_STATIC PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+-  #SET_TARGET_PROPERTIES ( LOG4CPP_STATIC PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${WIN_DEBUG_POSTFIX}  )
+-  TARGET_LINK_LIBRARIES ( LOG4CPP_SHARED PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+-  #SET_TARGET_PROPERTIES ( LOG4CPP_SHARED PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${WIN_DEBUG_POSTFIX} )
+-ENDIF (WIN32)
+-
+ INSTALL (
+   DIRECTORY include/log4cpp
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+@@ -147,11 +137,12 @@ INSTALL (
+   PATTERN ".svn" EXCLUDE
+   PATTERN "*.am" EXCLUDE
+   PATTERN "*.in" EXCLUDE
+  PATTERN ".cvsignore" EXCLUDE
+   )
+ 
+ INSTALL (
+-  TARGETS ${LOG4CPP_STATIC} ${LOG4CPP_SHARED}
+  TARGETS ${LOG4CPP_INSTALL_TARGETS}
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   )
--- a/ports/log4cpp-log4cpp/fix_link_msvcrt.patch
+++ b/ports/log4cpp-log4cpp/fix_link_msvcrt.patch
@@ -1,31 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 140910b..08cde3b 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,8 +81,12 @@ ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME}
- )
- 
- IF (WIN32)
-  TARGET_LINK_LIBRARIES (${LOG4CPP_LIBRARY_NAME} kernel32 user32 ws2_32 advapi32 )
-  SET_TARGET_PROPERTIES(${LOG4CPP_LIBRARY_NAME} PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt )
-+  TARGET_LINK_LIBRARIES (${LOG4CPP_LIBRARY_NAME} kernel32 user32 ws2_32 advapi32)
-+  IF ( CMAKE_BUILD_TYPE MATCHES "Debug" )
-+    SET_TARGET_PROPERTIES(${LOG4CPP_LIBRARY_NAME} PROPERTIES LINK_FLAGS /NODEFAULTLIB:MSVCRT)
-+  ELSE(CMAKE_BUILD_TYPE MATCHES "Debug" )
-+    SET_TARGET_PROPERTIES(${LOG4CPP_LIBRARY_NAME} PROPERTIES LINK_FLAGS /NODEFAULTLIB:MSVCRTD)
-+  ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug" )
- ENDIF (WIN32)
- 
- INSTALL (
-@@ -92,9 +96,11 @@ INSTALL (
-   PATTERN ".svn" EXCLUDE
-   PATTERN "*.am" EXCLUDE
-   PATTERN "*.in" EXCLUDE
-+  PATTERN ".cvsignore" EXCLUDE
-   )
- 
- INSTALL (
-   TARGETS ${LOG4CPP_LIBRARY_NAME}
-   ARCHIVE DESTINATION lib
-+  RUNTIME DESTINATION bin
-   )
--- a/ports/log4cpp-log4cpp/portfile.cmake
+++ b/ports/log4cpp-log4cpp/portfile.cmake
@@ -2,77 +2,52 @@ vcpkg_from_sourceforge(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO log4cpp/log4cpp-1.1.x%20%28new%29
    REF log4cpp-1.1
-    FILENAME "log4cpp-1.1.4.tar.gz"
-    SHA512 0cdbd46ccd048d70bea3c35d22080dc5dd21fc3b9c415fe464847e60775954f57e9c8344506f0f94f16e90e8bdaa9cc6d84d3aa65191501e52ee8dfc639f0398
+    FILENAME "log4cpp-${VERSION}.tar.gz"
+    SHA512 c12d9128499bc8b2ab39d3c7979b81ac5c2f033ddfb942bdcd70e5d06f8a78da0258f2295e716417d0dd7680fde983720ffb55851755297ff03cbf5ca7acdff8
    PATCHES
-        fix_link_msvcrt.patch
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
+        cmake_fix.patch
 )

 if(VCPKG_TARGET_IS_WINDOWS)
+    string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+    string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
+
+    vcpkg_cmake_configure(
+        SOURCE_PATH "${SOURCE_PATH}"
+        OPTIONS
+            -DLOG4CPP_BUILD_SHARED=${BUILD_SHARED}
+            -DLOG4CPP_BUILD_STATIC=${BUILD_STATIC}
+    )
    vcpkg_cmake_install()
    vcpkg_copy_pdbs()

-    set(VCPKG_POLICY_DLLS_WITHOUT_EXPORTS enabled)
    set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib" "${CURRENT_PACKAGES_DIR}/lib")
-
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-    endif()
 elseif(VCPKG_TARGET_IS_LINUX)
-    #message(STATUS "Configuring ${TARGET_TRIPLET}")
+    # The CMake build does not work under Linux because it depends on a config.h
+    # file that is currently only derived from config.h.in via configure.h.
+
    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
        set(SHARED_STATIC --enable-static --disable-shared)
    else()
        set(SHARED_STATIC --disable-static --enable-shared)
    endif()

-    set(OPTIONS ${SHARED_STATIC})
-    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-    set(CFLAGS "${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include")
-    set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
-    #create makefile
-    vcpkg_execute_required_process(
-    COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug
-    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-    LOGNAME configure-${TARGET_TRIPLET}-dbg)
-    
-    message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-    vcpkg_execute_required_process(
-        COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        LOGNAME install-${TARGET_TRIPLET}-dbg
+    vcpkg_make_configure(
+        SOURCE_PATH "${SOURCE_PATH}"
+        AUTORECONF
+        OPTIONS
+            ${SHARED_STATIC}
+            "--prefix=${CURRENT_PACKAGES_DIR}"
+            "--with-sysroot=${CURRENT_INSTALLED_DIR}"
    )
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-    
-    #build release log4cpp
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-    message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-    set(CFLAGS "${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include")
-    set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
-    vcpkg_execute_required_process(
-        COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME configure-${TARGET_TRIPLET}-rel
-    )
-    message(STATUS "Building ${TARGET_TRIPLET}-rel")
-    vcpkg_execute_required_process(
-        COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME install-${TARGET_TRIPLET}-rel
-    )
-    
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-    endif()
+    vcpkg_make_install()
    vcpkg_fixup_pkgconfig()
+
+    file(REMOVE_RECURSE
+        "${CURRENT_PACKAGES_DIR}/tools"
+        "${CURRENT_PACKAGES_DIR}/debug/share"
+    )
 endif()

 # Handle copyright
--- a/ports/log4cpp-log4cpp/vcpkg.json
+++ b/ports/log4cpp-log4cpp/vcpkg.json
@@ -1,13 +1,20 @@
 {
  "name": "log4cpp-log4cpp",
-  "version": "1.1.4",
+  "version": "1.1.5",
  "description": "A library of C++ classes for flexible logging to files (rolling), syslog, IDSA and other destinations. It is modeled after the Log for Java library (http://www.log4j.org), staying as close to their API as is reasonable.",
  "homepage": "https://sourceforge.net/projects/log4cpp/",
+  "license": "LGPL-2.1-only",
  "supports": "(linux | windows) & !uwp",
  "dependencies": [
    {
      "name": "vcpkg-cmake",
-      "host": true
+      "host": true,
+      "platform": "windows"
+    },
+    {
+      "name": "vcpkg-make",
+      "host": true,
+      "platform": "linux"
    }
  ]
 }
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5973,7 +5973,7 @@
      "port-version": 0
    },
    "log4cpp-log4cpp": {
-      "baseline": "1.1.4",
+      "baseline": "1.1.5",
      "port-version": 0
    },
    "log4cxx": {
--- a/versions/l-/log4cpp-log4cpp.json
+++ b/versions/l-/log4cpp-log4cpp.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "1982c13d3471de8dad12e424c30b865c35506add",
+      "version": "1.1.5",
+      "port-version": 0
+    },
    {
      "git-tree": "3ac5e6e898eeac3db01d2f9c70bc4df663e035f2",
      "version": "1.1.4",