From 428e498d27c1b4cfa5429f94f26473e130b07254 Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 14 Feb 2025 01:50:28 +0900 Subject: [PATCH 1/4] [cppmicroservices] update to 3.8.6 --- .../devendor_boost_absl.patch | 41 +++++++++---------- ports/cppmicroservices/portfile.cmake | 2 +- ports/cppmicroservices/vcpkg.json | 3 +- ports/cppmicroservices/werror.patch | 26 ++++++------ versions/baseline.json | 2 +- versions/c-/cppmicroservices.json | 5 +++ 6 files changed, 40 insertions(+), 39 deletions(-) diff --git a/ports/cppmicroservices/devendor_boost_absl.patch b/ports/cppmicroservices/devendor_boost_absl.patch index 359a75005c3d7f..8087f691cd5827 100644 --- a/ports/cppmicroservices/devendor_boost_absl.patch +++ b/ports/cppmicroservices/devendor_boost_absl.patch @@ -1,13 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55b99bb765..85b4484990 100644 +index 87cfb37..d7fbd20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -692,9 +692,9 @@ endif() - #----------------------------------------------------------------------------- +@@ -693,7 +693,7 @@ endif() # Compile libraries here if you do not want -Werror or /WX on #----------------------------------------------------------------------------- --add_subdirectory(third_party/absl) -+find_package(absl CONFIG REQUIRED) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries" FORCE) -add_subdirectory(third_party/boost/nowide) +find_package(Boost COMPONENTS nowide CONFIG REQUIRED) @@ -15,7 +12,7 @@ index 55b99bb765..85b4484990 100644 #----------------------------------------------------------------------------- diff --git a/cmake/usBundleConfig.cmake.in b/cmake/usBundleConfig.cmake.in -index c9cf743790..078c5b3fad 100644 +index c9cf743..f0ab1ca 100644 --- a/cmake/usBundleConfig.cmake.in +++ b/cmake/usBundleConfig.cmake.in @@ -3,6 +3,10 @@ @@ -30,7 +27,7 @@ index c9cf743790..078c5b3fad 100644 include("${CMAKE_CURRENT_LIST_DIR}/us@PROJECT_NAME@Targets.cmake") endif() diff --git a/compendium/CMakeLists.txt b/compendium/CMakeLists.txt -index a5713313ec..d26ac7e4fe 100644 +index a571331..d26ac7e 100644 --- a/compendium/CMakeLists.txt +++ b/compendium/CMakeLists.txt @@ -1,3 +1,4 @@ @@ -39,7 +36,7 @@ index a5713313ec..d26ac7e4fe 100644 add_subdirectory(test_bundles) endif() diff --git a/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp b/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp -index 50f02e6e1f..fdfa45d991 100644 +index 50f02e6..fdfa45d 100644 --- a/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp +++ b/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp @@ -22,10 +22,10 @@ @@ -58,10 +55,10 @@ index 50f02e6e1f..fdfa45d991 100644 namespace cppmicroservices { diff --git a/compendium/ConfigurationAdmin/src/CMakeLists.txt b/compendium/ConfigurationAdmin/src/CMakeLists.txt -index f2eca66ce7..8d7c8bd671 100644 +index a079c20..2657610 100644 --- a/compendium/ConfigurationAdmin/src/CMakeLists.txt +++ b/compendium/ConfigurationAdmin/src/CMakeLists.txt -@@ -25,7 +25,7 @@ set(_private_headers +@@ -28,7 +28,7 @@ set(_private_headers ) add_library(ConfigurationAdminObjs OBJECT ${_srcs} ${_private_headers}) @@ -71,7 +68,7 @@ index f2eca66ce7..8d7c8bd671 100644 get_property(_compile_flags TARGET ConfigurationAdminObjs PROPERTY COMPILE_FLAGS) set_property(TARGET ConfigurationAdminObjs PROPERTY COMPILE_FLAGS "${_compile_flags} -fPIC") diff --git a/compendium/DeclarativeServices/CMakeLists.txt b/compendium/DeclarativeServices/CMakeLists.txt -index 24f2820fa5..cb518781b4 100644 +index 2920189..810b00b 100755 --- a/compendium/DeclarativeServices/CMakeLists.txt +++ b/compendium/DeclarativeServices/CMakeLists.txt @@ -37,14 +37,14 @@ endif() @@ -81,7 +78,7 @@ index 24f2820fa5..cb518781b4 100644 - +find_package(Boost COMPONENTS asio CONFIG REQUIRED) usMacroCreateBundle(DeclarativeServices - VERSION "1.5.10" + VERSION "1.5.13" DEPENDS Framework TARGET DeclarativeServices SYMBOLIC_NAME declarative_services @@ -92,22 +89,23 @@ index 24f2820fa5..cb518781b4 100644 SOURCES $ src/SCRActivator.cpp BINARY_RESOURCES manifest.json diff --git a/compendium/DeclarativeServices/src/CMakeLists.txt b/compendium/DeclarativeServices/src/CMakeLists.txt -index d25961b6d7..9283babe46 100644 +index 726d402..4e075d5 100644 --- a/compendium/DeclarativeServices/src/CMakeLists.txt +++ b/compendium/DeclarativeServices/src/CMakeLists.txt -@@ -79,8 +79,9 @@ set(_private_headers +@@ -80,9 +80,9 @@ set(_private_headers metadata/ServiceMetadata.hpp metadata/Util.hpp ) - +find_package(Boost COMPONENTS asio CONFIG REQUIRED) add_library(DeclarativeServicesObjs OBJECT ${_srcs} ${_private_headers}) +- +target_link_libraries(DeclarativeServicesObjs PUBLIC Boost::asio) - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") get_property(_compile_flags TARGET DeclarativeServicesObjs PROPERTY COMPILE_FLAGS) + set_property(TARGET DeclarativeServicesObjs PROPERTY COMPILE_FLAGS "${_compile_flags} -fPIC") diff --git a/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp b/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp -index ffc93e9e86..1b9af7bd6c 100644 +index ffc93e9..1b9af7b 100644 --- a/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp +++ b/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp @@ -22,10 +22,10 @@ @@ -126,7 +124,7 @@ index ffc93e9e86..1b9af7bd6c 100644 namespace cppmicroservices { diff --git a/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp b/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp -index c4483a98c1..84d4217e7a 100644 +index c4483a9..84d4217 100644 --- a/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp +++ b/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp @@ -30,7 +30,7 @@ @@ -139,14 +137,13 @@ index c4483a98c1..84d4217e7a 100644 #include "states/CCUnsatisfiedReferenceState.hpp" #include "states/ComponentConfigurationState.hpp" diff --git a/tools/rc/CMakeLists.txt b/tools/rc/CMakeLists.txt -index c4a36f8dd1..ffcf13e44a 100644 +index c4a36f8..8844292 100755 --- a/tools/rc/CMakeLists.txt +++ b/tools/rc/CMakeLists.txt -@@ -19,9 +19,8 @@ set_property(TARGET ${US_RCC_EXECUTABLE_TARGET} PROPERTY OUTPUT_NAME ${US_RCC_EX - if(WIN32) +@@ -20,8 +20,8 @@ if(WIN32) target_link_libraries(${US_RCC_EXECUTABLE_TARGET} Shlwapi) endif() -- + -target_link_libraries(${US_RCC_EXECUTABLE_TARGET} nowide::nowide) -target_include_directories(${US_RCC_EXECUTABLE_TARGET} PRIVATE ${CppMicroServices_SOURCE_DIR}/third_party/boost/nowide/include) +find_package(Boost COMPONENTS nowide CONFIG REQUIRED) @@ -155,7 +152,7 @@ index c4a36f8dd1..ffcf13e44a 100644 set_property(TARGET ${US_RCC_EXECUTABLE_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS "MINIZ_NO_ARCHIVE_READING_API;MINIZ_NO_ZLIB_COMPATIBLE_NAMES") diff --git a/tools/rc/ResourceCompiler.cpp b/tools/rc/ResourceCompiler.cpp -index a5b81d3522..4e92db4e3a 100644 +index a5b81d3..4e92db4 100755 --- a/tools/rc/ResourceCompiler.cpp +++ b/tools/rc/ResourceCompiler.cpp @@ -37,9 +37,12 @@ diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index 989894c8ff13b8..46656f50c58964 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CppMicroServices/CppMicroservices REF "v${VERSION}" - SHA512 26b76b124fba50a079b002867f5d349b4719833358f09712a73bc3f4370362bc27b01eb7ba31e3a0d01f101f70e5be45d5d99fe9f25216eadacc02127459d91b + SHA512 6378f929bebd2d77d260791c0518dc0fcda43a19ade2475d5e20698c594c178ed1f9123d65017fc25c34c95437d25d5eca889224c6650a1c37584842ddc6dbab HEAD_REF development PATCHES werror.patch diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json index 315e4893717a34..2b103d4621c788 100644 --- a/ports/cppmicroservices/vcpkg.json +++ b/ports/cppmicroservices/vcpkg.json @@ -1,11 +1,10 @@ { "name": "cppmicroservices", - "version": "3.8.4", + "version": "3.8.6", "description": "An OSGi-like C++ dynamic module system and service registry", "homepage": "https://github.com/CppMicroServices/CppMicroServices", "license": "Apache-2.0", "dependencies": [ - "abseil", "boost-asio", "boost-nowide", "gtest", diff --git a/ports/cppmicroservices/werror.patch b/ports/cppmicroservices/werror.patch index b06f43a72c7077..83343a1dcb8e74 100644 --- a/ports/cppmicroservices/werror.patch +++ b/ports/cppmicroservices/werror.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 24fd87e..974064c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -382,7 +382,7 @@ else() - usFunctionCheckCompilerFlags(-fstack-protector-all US_CXX_FLAGS) - endif() - -- foreach(_cxxflag -Werror -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align -+ foreach(_cxxflag -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align - -Wwrite-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast - -Wstrict-null-sentinel -Wsign-promo -fdiagnostics-show-option ) - usFunctionCheckCompilerFlags(${_cxxflag} US_CXX_FLAGS) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 267b82e..87cfb37 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -552,7 +552,7 @@ else() + usFunctionCheckCompilerFlags(-fstack-protector-all US_CXX_FLAGS) + endif() + +- foreach(_cxxflag -Werror -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align ++ foreach(_cxxflag -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align + -Wwrite-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast + -Wstrict-null-sentinel -Wsign-promo -fdiagnostics-show-option ) + usFunctionCheckCompilerFlags(${_cxxflag} US_CXX_FLAGS) diff --git a/versions/baseline.json b/versions/baseline.json index 2212d8e4cb2230..9cecd22811b542 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1965,7 +1965,7 @@ "port-version": 0 }, "cppmicroservices": { - "baseline": "3.8.4", + "baseline": "3.8.6", "port-version": 0 }, "cppp-reiconv": { diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 49c5d221f6d173..0f2935d0748e83 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e0f4bdf55cae3a38e418da7bd87cf21c47175b8", + "version": "3.8.6", + "port-version": 0 + }, { "git-tree": "6139bba03bcfb25bcf76fca8ef1a2b3124eb63a1", "version": "3.8.4", From d5f626ba8aa81b7e241dd338e6c6d3876bd4cf8e Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 14 Feb 2025 19:50:49 +0900 Subject: [PATCH 2/4] use VCPKG_LIBRARY_LINKAGE instead of BUILD_SHARE_LIBS --- ports/cppmicroservices/portfile.cmake | 2 +- versions/c-/cppmicroservices.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index 46656f50c58964..029ebcff82cb38 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -38,6 +38,6 @@ vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # CppMicroServices uses a custom resource compiler to compile resources # the zipped resources are then appended to the target which cause the linker to crash # when compiling a static library -if(NOT BUILD_SHARED_LIBS) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) endif() \ No newline at end of file diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 0f2935d0748e83..3fa68d5de7af3f 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5e0f4bdf55cae3a38e418da7bd87cf21c47175b8", + "git-tree": "4cf8c626d288097e3579e35601f057a8218fbbb0", "version": "3.8.6", "port-version": 0 }, From 1c1815775593f8ef4c302c0a2f5d94b9d1476195 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 18 Feb 2025 01:26:00 +0900 Subject: [PATCH 3/4] revert abseil, add end of line --- ports/cppmicroservices/portfile.cmake | 2 +- ports/cppmicroservices/vcpkg.json | 1 + versions/c-/cppmicroservices.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index 029ebcff82cb38..0763d59d2c0ab6 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -40,4 +40,4 @@ vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # when compiling a static library if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -endif() \ No newline at end of file +endif() diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json index 2b103d4621c788..027a9d331a62db 100644 --- a/ports/cppmicroservices/vcpkg.json +++ b/ports/cppmicroservices/vcpkg.json @@ -5,6 +5,7 @@ "homepage": "https://github.com/CppMicroServices/CppMicroServices", "license": "Apache-2.0", "dependencies": [ + "abseil", "boost-asio", "boost-nowide", "gtest", diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 3fa68d5de7af3f..fb6b6182fb62bd 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4cf8c626d288097e3579e35601f057a8218fbbb0", + "git-tree": "7ffcb93d9b8170b9d3c1f052410b5d815a8c4e68", "version": "3.8.6", "port-version": 0 }, From 1c0d3b1e8304778798764505ade3219c11662648 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 18 Feb 2025 15:03:38 +0900 Subject: [PATCH 4/4] (trial) skip absolute paths check --- ports/cppmicroservices/portfile.cmake | 2 ++ versions/c-/cppmicroservices.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index 0763d59d2c0ab6..8f3d6133f5b025 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -1,3 +1,5 @@ +set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CppMicroServices/CppMicroservices diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index fb6b6182fb62bd..d37f160a8a25b5 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7ffcb93d9b8170b9d3c1f052410b5d815a8c4e68", + "git-tree": "6f1fcd4799ffc9e636bb8a86d2931e67a1bc0345", "version": "3.8.6", "port-version": 0 },