From f0c8848cde589649bca3ab3649668540403786ce Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 29 Aug 2024 07:56:38 +0000 Subject: [PATCH] [loguru,libosip2] Fix build check failure on Android platform (#40562) --- ports/libosip2/portfile.cmake | 4 +-- ports/libosip2/vcpkg.json | 1 + ports/loguru/CMakeLists.txt | 55 ------------------------------ ports/loguru/loguruConfig.cmake.in | 9 ----- ports/loguru/portfile.cmake | 50 +++++++++++++-------------- ports/loguru/vcpkg.json | 2 +- scripts/ci.baseline.txt | 6 ---- versions/baseline.json | 4 +-- versions/l-/libosip2.json | 5 +++ versions/l-/loguru.json | 5 +++ 10 files changed, 39 insertions(+), 102 deletions(-) delete mode 100644 ports/loguru/CMakeLists.txt delete mode 100644 ports/loguru/loguruConfig.cmake.in diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index ed636c21c6..8348c57a60 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_extract_source_archive( PATCHES ${PATCHES} ) -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" foreach(VCXPROJ IN ITEMS "${SOURCE_PATH}/platform/vsnet/osip2.vcxproj" @@ -39,7 +39,7 @@ if(VCPKG_TARGET_IS_WINDOWS) PROJECT_SUBPATH "platform/vsnet/osipparser2.vcxproj" ) -elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) +else() vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_make() vcpkg_fixup_pkgconfig() diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json index ac9798c9ca..976a67970b 100644 --- a/ports/libosip2/vcpkg.json +++ b/ports/libosip2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libosip2", "version": "5.3.1", + "port-version": 1, "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", "homepage": "https://www.gnu.org/software/osip/", "supports": "!(windows & arm) & !uwp", diff --git a/ports/loguru/CMakeLists.txt b/ports/loguru/CMakeLists.txt deleted file mode 100644 index 473392aa83..0000000000 --- a/ports/loguru/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -cmake_minimum_required(VERSION 3.12) - -project(loguru CXX) -set(CMAKE_CXX_STANDARD 11) - -option(INSTALL_HEADERS "Install header files" ON) -option(BUILD_WITH_FMT "Build with fmt support" OFF) - -set(loguru_headers - loguru.hpp -) -set(loguru_sources - loguru.cpp -) - -add_library(loguru ${loguru_sources}) -target_include_directories(loguru PUBLIC - $ - $) - -if(BUILD_WITH_FMT) - target_compile_definitions(loguru PRIVATE LOGURU_USE_FMTLIB=1) - find_package(fmt CONFIG REQUIRED) - target_link_libraries(loguru PUBLIC fmt::fmt) -endif() - -if(UNIX) - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - target_link_libraries(loguru PUBLIC Threads::Threads ${CMAKE_DL_LIBS}) -endif() - -set(LOGURU_INCLUDE_INSTALL_DIR include/loguru CACHE PATH "Install directory for headers") -if(INSTALL_HEADERS) - install(FILES ${loguru_headers} DESTINATION ${LOGURU_INCLUDE_INSTALL_DIR}) -endif() - -set(INCLUDE_INSTALL_DIR ${LOGURU_INCLUDE_INSTALL_DIR}) - -include(CMakePackageConfigHelpers) -configure_package_config_file(loguruConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/loguruConfig.cmake - INSTALL_DESTINATION share/loguru - NO_CHECK_REQUIRED_COMPONENTS_MACRO - PATH_VARS INCLUDE_INSTALL_DIR) - -install(TARGETS loguru - EXPORT loguruTargets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/loguruConfig.cmake DESTINATION share/loguru) -install(EXPORT loguruTargets DESTINATION share/loguru) diff --git a/ports/loguru/loguruConfig.cmake.in b/ports/loguru/loguruConfig.cmake.in deleted file mode 100644 index b75b189e04..0000000000 --- a/ports/loguru/loguruConfig.cmake.in +++ /dev/null @@ -1,9 +0,0 @@ -@PACKAGE_INIT@ - -if(UNIX) - include(CMakeFindDependencyMacro) - find_dependency(Threads) -endif() - -set_and_check(loguru_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -include("${CMAKE_CURRENT_LIST_DIR}/loguruTargets.cmake") diff --git a/ports/loguru/portfile.cmake b/ports/loguru/portfile.cmake index a581eab88b..b6643845b5 100644 --- a/ports/loguru/portfile.cmake +++ b/ports/loguru/portfile.cmake @@ -1,37 +1,33 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emilk/loguru - REF 9c2fea0d4530657f23259be4132f8101c98b579e #v2.1.0 - SHA512 49eebf8648f9d29273af76dca0a4e49155daa3664e98979df005e64eb0fa9f4eeb4228245327d469772c51076571acbe39a644eba531444d8676d9709a7e3914 + REF 4adaa185883e3c04da25913579c451d3c32cfac1 #v2.1.0 + SHA512 813c9f9171a828a40270a3ad9f98124586eb56d37f263d55cd1ea6ac997d64431e2ae846f3dc0b477f8bf30873270c53b4bd7e6b6fc52259d2fd36126b24bbe6 HEAD_REF master ) -if(VCPKG_TARGET_IS_WINDOWS) - file(INSTALL ${SOURCE_PATH}/loguru.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru) - file(INSTALL ${SOURCE_PATH}/loguru.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru) -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fmt BUILD_WITH_FMT +) -if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) - configure_file(${CMAKE_CURRENT_LIST_DIR}/loguruConfig.cmake.in ${SOURCE_PATH}/loguruConfig.cmake.in COPYONLY) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF + OPTIONS + ${FEATURE_OPTIONS} + ) - vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - fmt BUILD_WITH_FMT - ) +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/loguru") +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG - -DINSTALL_HEADERS=OFF - OPTIONS - ${FEATURE_OPTIONS} - ) - vcpkg_cmake_install() - vcpkg_cmake_config_fixup() - vcpkg_copy_pdbs() -endif() - -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/copyright") diff --git a/ports/loguru/vcpkg.json b/ports/loguru/vcpkg.json index d6705d6faf..758da8eb4a 100644 --- a/ports/loguru/vcpkg.json +++ b/ports/loguru/vcpkg.json @@ -1,7 +1,7 @@ { "name": "loguru", "version": "2.1.0", - "port-version": 3, + "port-version": 4, "description": "A lightweight and flexible C++ logging library", "homepage": "https://github.com/emilk/loguru", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a48f8e9475..28ecc2cad3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -605,9 +605,6 @@ libmysql:x86-windows=skip libopensp:arm-neon-android=fail libopensp:arm64-android=fail libopensp:x64-android=fail -libosip2:arm-neon-android=fail -libosip2:arm64-android=fail -libosip2:x64-android=fail libp7client:x64-android=fail libpng-apng:arm64-windows = skip libpng-apng:arm64-uwp = skip @@ -700,9 +697,6 @@ llvm:x64-android=fail log4cplus:arm64-uwp=fail log4cplus:x64-uwp=fail log4cpp:x64-linux=fail # dynamic exception specifications -loguru:arm-neon-android=fail -loguru:arm64-android=fail -loguru:x64-android=fail # 32-bit needs android-24 lua:arm-neon-android=fail magma:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index 5f174f3083..bc66238fb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4854,7 +4854,7 @@ }, "libosip2": { "baseline": "5.3.1", - "port-version": 0 + "port-version": 1 }, "libosmium": { "baseline": "2.20.0", @@ -5510,7 +5510,7 @@ }, "loguru": { "baseline": "2.1.0", - "port-version": 3 + "port-version": 4 }, "lpeg": { "baseline": "1.1.0", diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index df0a6daa2b..947dfe3b53 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21f43364595f76ad0ef3d516ac68f7473fa30c24", + "version": "5.3.1", + "port-version": 1 + }, { "git-tree": "cb02960c7156b49272969e224ccb0903c0a42a24", "version": "5.3.1", diff --git a/versions/l-/loguru.json b/versions/l-/loguru.json index f6ecdd322f..132cd1f0fa 100644 --- a/versions/l-/loguru.json +++ b/versions/l-/loguru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb3e7c33bf919ef01ff262f2b3b40ab89270a12b", + "version": "2.1.0", + "port-version": 4 + }, { "git-tree": "827f85e170a1d4548088fa36cf46817e146184d0", "version": "2.1.0",