diff --git a/devel/easyloggingpp/Makefile b/devel/easyloggingpp/Makefile index d4f47b3eb6e8..1cad256824aa 100644 --- a/devel/easyloggingpp/Makefile +++ b/devel/easyloggingpp/Makefile @@ -1,31 +1,31 @@ PORTNAME= easyloggingpp DISTVERSIONPREFIX= v -DISTVERSION= 9.97.0 +DISTVERSION= 9.97.1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ logging library WWW= https://github.com/amrayn/easyloggingpp LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake compiler:c++11-lang USE_LDCONFIG= yes CMAKE_ON= build_shared_lib # patched in, requested such option in https://github.com/muflihun/easyloggingpp/issues/603 USE_GITHUB= yes GH_ACCOUNT= amrayn PLIST_FILES= include/easylogging++.h \ include/easylogging++.cc \ lib/libeasyloggingpp.so \ libdata/pkgconfig/easyloggingpp.pc do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Dtest:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/devel/easyloggingpp/distinfo b/devel/easyloggingpp/distinfo index 3b94fa9f030d..1456fa02b9c8 100644 --- a/devel/easyloggingpp/distinfo +++ b/devel/easyloggingpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609052128 -SHA256 (amrayn-easyloggingpp-v9.97.0_GH0.tar.gz) = 9110638e21ef02428254af8688bf9e766483db8cc2624144aa3c59006907ce22 -SIZE (amrayn-easyloggingpp-v9.97.0_GH0.tar.gz) = 750851 +TIMESTAMP = 1689917247 +SHA256 (amrayn-easyloggingpp-v9.97.1_GH0.tar.gz) = ebe473e17b13f1d1f16d0009689576625796947a711e14aec29530f39560c7c2 +SIZE (amrayn-easyloggingpp-v9.97.1_GH0.tar.gz) = 771149 diff --git a/devel/easyloggingpp/files/patch-CMakeLists.txt b/devel/easyloggingpp/files/patch-CMakeLists.txt index bdbacaacc699..fbc20a14441f 100644 --- a/devel/easyloggingpp/files/patch-CMakeLists.txt +++ b/devel/easyloggingpp/files/patch-CMakeLists.txt @@ -1,53 +1,53 @@ ---- CMakeLists.txt.orig 2020-12-25 09:02:08 UTC +--- CMakeLists.txt.orig 2023-07-20 03:46:10 UTC +++ CMakeLists.txt -@@ -22,7 +22,7 @@ macro(require_cpp11) +@@ -22,7 +22,7 @@ macro(require_cpp14) endmacro() option(test "Build all tests" OFF) -option(build_static_lib "Build easyloggingpp as a static library" OFF) +option(build_shared_lib "Build easyloggingpp as a shared library" OFF) option(lib_utc_datetime "Build library with UTC date/time logging" OFF) set(ELPP_MAJOR_VERSION "9") @@ -31,7 +31,7 @@ set(ELPP_PATCH_VERSION "7") set(ELPP_VERSION_STRING "${ELPP_MAJOR_VERSION}.${ELPP_MINOR_VERSION}.${ELPP_PATCH_VERSION}") set(ELPP_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in") -set(ELPP_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") +set(ELPP_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) @@ -52,18 +52,18 @@ if (HAVE_EXECINFO) add_definitions(-DHAVE_EXECINFO) endif() -if (build_static_lib) +if (build_shared_lib) if (lib_utc_datetime) add_definitions(-DELPP_UTC_DATETIME) endif() - require_cpp11() + require_cpp14() - add_library(easyloggingpp STATIC src/easylogging++.cc) + add_library(easyloggingpp SHARED src/easylogging++.cc) set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON) install(TARGETS easyloggingpp - ARCHIVE DESTINATION lib) + DESTINATION lib) endif() export(PACKAGE ${PROJECT_NAME}) -@@ -98,7 +98,9 @@ if (test) +@@ -97,7 +97,9 @@ if (test) ) # Standard linking to gtest stuff. -- target_link_libraries(easyloggingpp-unit-tests gtest gtest_main) +- target_link_libraries(easyloggingpp-unit-tests ${GTEST_BOTH_LIBRARIES}) + target_include_directories(easyloggingpp-unit-tests PRIVATE ${CMAKE_INSTALL_PREFIX}/include) + target_link_directories(easyloggingpp-unit-tests PRIVATE ${CMAKE_INSTALL_PREFIX}/lib) -+ target_link_libraries(easyloggingpp-unit-tests gtest gtest_main execinfo) ++ target_link_libraries(easyloggingpp-unit-tests ${GTEST_BOTH_LIBRARIES} execinfo) add_test(NAME easyloggingppUnitTests COMMAND easyloggingpp-unit-tests -v) endif()