diff --git a/ports/ng-log/devendor-dirent.patch b/ports/ng-log/devendor-dirent.patch new file mode 100644 index 0000000000..cdcf9eaf32 --- /dev/null +++ b/ports/ng-log/devendor-dirent.patch @@ -0,0 +1,17 @@ +diff --git a/src/logging.cc b/src/logging.cc +index 44bf8cb..013da81 100644 +--- a/src/logging.cc ++++ b/src/logging.cc +@@ -54,11 +54,7 @@ + #include "stacktrace.h" + #include "utilities.h" + +-#ifdef NGLOG_OS_WINDOWS +-# include "windows/dirent.h" +-#else +-# include // for automatic removal of old logs +-#endif ++#include // for automatic removal of old logs + + #include + #include diff --git a/ports/ng-log/portfile.cmake b/ports/ng-log/portfile.cmake index 82efc52c3f..b1356c3bd5 100644 --- a/ports/ng-log/portfile.cmake +++ b/ports/ng-log/portfile.cmake @@ -1,39 +1,83 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ng-log/ng-log - REF "v${VERSION}" - SHA512 0685e92f5d147d162be71e666cfaae52aaf23b7f3e3d5bc1384345ac05dfd16e7163ff7c1c7d83a70fb00fb56a5c9be6a246c0690d9fb01ba2b5c1576ee8787b - HEAD_REF master -) - -set(CROSSCOMP_OPTIONS "") -if(VCPKG_CROSSCOMPILING) - set(CROSSCOMP_OPTIONS -DHAVE_SYMBOLIZE_EXITCODE=0) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_COMPAT=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTING=OFF - -DPRINT_UNSYMBOLIZED_STACK_TRACES=OFF - -DWITH_GFLAGS=ON - -DWITH_GTEST=OFF - -DWITH_PKGCONFIG=ON - -DWITH_SYMBOLIZE=ON - -DWITH_TLS=ON - ${CROSSCOMP_OPTIONS} -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) - -vcpkg_copy_pdbs() - -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ng-log/ng-log + REF "v${VERSION}" + SHA512 321ea867b4ef2c73d0d54ae7906942ad1341605f5a837c296170f3295e96cf87a42c4c71ce707983e09d865dd29e6cc0656fc640c2214381f9c0f0f242365e70 + HEAD_REF master + PATCHES + devendor-dirent.patch +) + +set(CROSSCOMP_OPTIONS "") +if(VCPKG_CROSSCOMPILING) + set(CROSSCOMP_OPTIONS -DHAVE_SYMBOLIZE_EXITCODE=0) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_COMPAT=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DPRINT_UNSYMBOLIZED_STACK_TRACES=OFF + -DWITH_GFLAGS=ON + -DWITH_GTEST=OFF + -DWITH_PKGCONFIG=ON + -DWITH_SYMBOLIZE=ON + -DWITH_TLS=ON + ${CROSSCOMP_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libng-log.pc" + "-lgflags" + "-lgflags_static -lshlwapi" + ) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libng-log.pc" + "-lgflags" + "-lgflags_static_debug -lshlwapi" + ) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libng-log.pc" + " -lng-log" + " -lng-logd" + ) + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +foreach(header IN ITEMS flags.h log_severity.h logging.h raw_logging.h vlog_is_on.h) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/ng-log/${header}" + "#if defined(NGLOG_USE_EXPORT)" + "#if 1" + ) +endforeach() + +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/ng-log/flags.h" + "#if defined(NGLOG_USE_GFLAGS)" + "#if 1" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ng-log/export.h" "#ifdef NGLOG_STATIC_DEFINE" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ng-log/export.h" "#ifdef NGLOG_STATIC_DEFINE" "#if 0") +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/ng-log/vcpkg.json b/ports/ng-log/vcpkg.json index 4e79317059..28b9a139f6 100644 --- a/ports/ng-log/vcpkg.json +++ b/ports/ng-log/vcpkg.json @@ -1,10 +1,14 @@ { "name": "ng-log", - "version": "0.8.2", + "version": "0.8.3", "description": "C++ library for application-level logging", "homepage": "https://ng-log.github.io/ng-log/", "license": "BSD-3-Clause", "dependencies": [ + { + "name": "dirent", + "platform": "windows" + }, "gflags", { "name": "libunwind", diff --git a/versions/baseline.json b/versions/baseline.json index bbedccb1bb..3b4aa58483 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7081,7 +7081,7 @@ "port-version": 4 }, "ng-log": { - "baseline": "0.8.2", + "baseline": "0.8.3", "port-version": 0 }, "nghttp2": { diff --git a/versions/n-/ng-log.json b/versions/n-/ng-log.json index 75ab0c5e35..4b8801151f 100644 --- a/versions/n-/ng-log.json +++ b/versions/n-/ng-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2c6aa68a5c8286e294d02f91075e98e0132c6ff", + "version": "0.8.3", + "port-version": 0 + }, { "git-tree": "2baad2edeaffc28162ace5cc5fc5744fab48bb92", "version": "0.8.2",