diff --git a/ports/azure-c-shared-utility/fix-install-location-preview.patch b/ports/azure-c-shared-utility/fix-install-location-preview.patch deleted file mode 100644 index 41162fd2ee..0000000000 --- a/ports/azure-c-shared-utility/fix-install-location-preview.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25bbf383..31ca2da2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -678,7 +678,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR "lib") - endif() - --set(package_location "cmake") -+set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") - - if(${build_as_dynamic}) - set(targets aziotsharedutil aziotsharedutil_dll) diff --git a/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch b/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch deleted file mode 100644 index c89d92f584..0000000000 --- a/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch +++ /dev/null @@ -1,248 +0,0 @@ -diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake -index e85defa..7f450ab 100644 ---- a/configs/azure_c_shared_utilityFunctions.cmake -+++ b/configs/azure_c_shared_utilityFunctions.cmake -@@ -2,11 +2,11 @@ - #Licensed under the MIT license. See LICENSE file in the project root for full license information. - - function(target_link_libraries_with_arg_prefix arg_prefix whatIsBuilding lib) -- if(${arg_prefix} STREQUAL "debug") -+ if(arg_prefix STREQUAL "debug") - target_link_libraries(${whatIsBuilding} debug ${lib}) -- elseif(${arg_prefix} STREQUAL "optimized") -+ elseif(arg_prefix STREQUAL "optimized") - target_link_libraries(${whatIsBuilding} optimized ${lib}) -- elseif(${arg_prefix} STREQUAL "general") -+ elseif(arg_prefix STREQUAL "general") - target_link_libraries(${whatIsBuilding} general ${lib}) - else() - target_link_libraries(${whatIsBuilding} ${lib}) -@@ -43,13 +43,13 @@ function(windows_unittests_add_dll whatIsBuilding) - set(ARG_PREFIX "none") - foreach(f ${ARGN}) - set(skip_to_next FALSE) -- if(${f} STREQUAL "ADDITIONAL_LIBS") -+ if(f STREQUAL "ADDITIONAL_LIBS") - SET(PARSING_ADDITIONAL_LIBS ON) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) - set(ARG_PREFIX "none") - #also unset all the other states - set(skip_to_next TRUE) -- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") -+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") - SET(PARSING_ADDITIONAL_LIBS OFF) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) - set(skip_to_next TRUE) -@@ -57,7 +57,7 @@ function(windows_unittests_add_dll whatIsBuilding) - - if(NOT skip_to_next) - if(PARSING_ADDITIONAL_LIBS) -- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) -+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) - SET(ARG_PREFIX ${f}) - else() - target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f}) -@@ -90,13 +90,13 @@ function(windows_unittests_add_exe whatIsBuilding) - set(ARG_PREFIX "none") - foreach(f ${ARGN}) - set(skip_to_next FALSE) -- if(${f} STREQUAL "ADDITIONAL_LIBS") -+ if(f STREQUAL "ADDITIONAL_LIBS") - SET(PARSING_ADDITIONAL_LIBS ON) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) - set(ARG_PREFIX "none") - #also unset all the other states - set(skip_to_next TRUE) -- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") -+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") - SET(PARSING_ADDITIONAL_LIBS OFF) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) - set(skip_to_next TRUE) -@@ -104,7 +104,7 @@ function(windows_unittests_add_exe whatIsBuilding) - - if(NOT skip_to_next) - if(PARSING_ADDITIONAL_LIBS) -- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) -+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) - SET(ARG_PREFIX ${f}) - else() - target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) -@@ -150,14 +150,14 @@ function(linux_unittests_add_exe whatIsBuilding) - set(ARG_PREFIX "none") - foreach(f ${ARGN}) - set(skip_to_next FALSE) -- if(${f} STREQUAL "ADDITIONAL_LIBS") -+ if(f STREQUAL "ADDITIONAL_LIBS") - SET(PARSING_ADDITIONAL_LIBS ON) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) - set(ARG_PREFIX "none") - set(skip_to_next TRUE) - #also unset all the other states - -- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") -+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") - SET(PARSING_ADDITIONAL_LIBS OFF) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) - set(skip_to_next TRUE) -@@ -165,7 +165,7 @@ function(linux_unittests_add_exe whatIsBuilding) - - if(NOT skip_to_next) - if(PARSING_ADDITIONAL_LIBS) -- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) -+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) - SET(ARG_PREFIX ${f}) - else() - target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) -@@ -184,7 +184,7 @@ function(linux_unittests_add_exe whatIsBuilding) - - if(${run_valgrind}) - find_program(VALGRIND_FOUND NAMES valgrind) -- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND) -+ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND) - message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind") - else() - add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $) -@@ -307,13 +307,13 @@ function(c_windows_unittests_add_dll whatIsBuilding folder) - set(ARG_PREFIX "none") - foreach(f ${ARGN}) - set(skip_to_next FALSE) -- if(${f} STREQUAL "ADDITIONAL_LIBS") -+ if(f STREQUAL "ADDITIONAL_LIBS") - SET(PARSING_ADDITIONAL_LIBS ON) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) - set(ARG_PREFIX "none") - #also unset all the other states - set(skip_to_next TRUE) -- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") -+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") - SET(PARSING_ADDITIONAL_LIBS OFF) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) - set(skip_to_next TRUE) -@@ -321,7 +321,7 @@ function(c_windows_unittests_add_dll whatIsBuilding folder) - - if(NOT skip_to_next) - if(PARSING_ADDITIONAL_LIBS) -- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) -+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) - SET(ARG_PREFIX ${f}) - else() - target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f}) -@@ -369,13 +369,13 @@ function(c_windows_unittests_add_exe whatIsBuilding folder) - set(ARG_PREFIX "none") - foreach(f ${ARGN}) - set(skip_to_next FALSE) -- if(${f} STREQUAL "ADDITIONAL_LIBS") -+ if(f STREQUAL "ADDITIONAL_LIBS") - SET(PARSING_ADDITIONAL_LIBS ON) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) - set(ARG_PREFIX "none") - #also unset all the other states - set(skip_to_next TRUE) -- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") -+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") - SET(PARSING_ADDITIONAL_LIBS OFF) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) - set(skip_to_next TRUE) -@@ -383,7 +383,7 @@ function(c_windows_unittests_add_exe whatIsBuilding folder) - - if(NOT skip_to_next) - if(PARSING_ADDITIONAL_LIBS) -- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) -+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) - SET(ARG_PREFIX ${f}) - else() - target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) -@@ -429,13 +429,13 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) - set(ARG_PREFIX "none") - foreach(f ${ARGN}) - set(skip_to_next FALSE) -- if(${f} STREQUAL "ADDITIONAL_LIBS") -+ if(f STREQUAL "ADDITIONAL_LIBS") - SET(PARSING_ADDITIONAL_LIBS ON) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) - set(ARG_PREFIX "none") - #also unset all the other states - set(skip_to_next TRUE) -- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") -+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") - SET(PARSING_ADDITIONAL_LIBS OFF) - SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) - set(skip_to_next TRUE) -@@ -443,7 +443,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) - - if(NOT skip_to_next) - if(PARSING_ADDITIONAL_LIBS) -- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) -+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) - SET(ARG_PREFIX ${f}) - else() - target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) -@@ -462,7 +462,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) - - if(${run_valgrind}) - find_program(VALGRIND_FOUND NAMES valgrind) -- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND) -+ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND) - message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind") - else() - add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --gen-suppressions=all --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $) -@@ -546,29 +546,29 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat) - (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests}) - ) - if (${use_cppunittest}) -- if(${compileAsWhat} STREQUAL "C99") -+ if(compileAsWhat STREQUAL "C99") - compileTargetAsC99(${whatIsBuilding}_dll) - compileTargetAsC99(${whatIsBuilding}_testsonly_lib) - endif() -- if(${compileAsWhat} STREQUAL "C11") -+ if(compileAsWhat STREQUAL "C11") - compileTargetAsC11(${whatIsBuilding}_dll) - compileTargetAsC11(${whatIsBuilding}_testsonly_lib) - endif() - endif() -- if(${compileAsWhat} STREQUAL "C99") -+ if(compileAsWhat STREQUAL "C99") - compileTargetAsC99(${whatIsBuilding}_exe) - endif() -- if(${compileAsWhat} STREQUAL "C11") -+ if(compileAsWhat STREQUAL "C11") - compileTargetAsC11(${whatIsBuilding}_exe) - endif() - else() - if( - (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${nuget_e2e_tests}) - ) -- if(${compileAsWhat} STREQUAL "C99") -+ if(compileAsWhat STREQUAL "C99") - compileTargetAsC99(${whatIsBuilding}_exe) - endif() -- if(${compileAsWhat} STREQUAL "C11") -+ if(compileAsWhat STREQUAL "C11") - compileTargetAsC11(${whatIsBuilding}_exe) - endif() - else() -@@ -581,10 +581,10 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat) - (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${run_e2e_tests}) OR - (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests}) - ) -- if(${compileAsWhat} STREQUAL "C99") -+ if(compileAsWhat STREQUAL "C99") - compileTargetAsC99(${whatIsBuilding}_exe) - endif() -- if(${compileAsWhat} STREQUAL "C11") -+ if(compileAsWhat STREQUAL "C11") - compileTargetAsC11(${whatIsBuilding}_exe) - endif() - endif() -@@ -641,8 +641,8 @@ function(set_platform_files c_shared_dir) - set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE) - endif() - if(use_etw) -- if(${use_etw} OR (${use_etw} STREQUAL "ON_WITH_CONSOLE")) -- if (${use_etw} STREQUAL "ON_WITH_CONSOLE") -+ if(use_etw OR (use_etw STREQUAL "ON_WITH_CONSOLE")) -+ if (use_etw STREQUAL "ON_WITH_CONSOLE") - set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE) - set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE) - set(LOGGING_RC_FILE ${c_shared_dir}/res/etwlogger.rc CACHE INTERNAL "") diff --git a/ports/azure-c-shared-utility/improve-dependencies-preview.patch b/ports/azure-c-shared-utility/improve-dependencies-preview.patch deleted file mode 100644 index 42fe1e6583..0000000000 --- a/ports/azure-c-shared-utility/improve-dependencies-preview.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 46334c1..aaeea20 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -115,7 +115,6 @@ if(${use_openssl}) - if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR}) - find_package(OpenSSL REQUIRED) - endif() -- include_directories(${OPENSSL_INCLUDE_DIR}) - endif() - - if(${use_applessl}) -@@ -521,8 +520,7 @@ if(${use_http}) - set(CURL_FIND_REQUIRED 1) - find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES) - -- include_directories(${CURL_INCLUDE_DIRS}) -- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES}) -+ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl) - endif(NOT use_builtin_httpapi) - endif() - endif(${use_http}) -@@ -561,7 +559,7 @@ if(${use_bearssl}) - endif() - - if(${use_openssl}) -- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES}) -+ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL) - if (WIN32) - set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32) - endif() -@@ -703,7 +701,7 @@ write_basic_package_version_file( - - configure_file("configs/${PROJECT_NAME}Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" -- COPYONLY -+ @ONLY - ) - - install(EXPORT aziotsharedutilTargets -@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets - - install( - FILES -- "configs/${PROJECT_NAME}Config.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" - "configs/${PROJECT_NAME}Functions.cmake" - "configs/azure_iot_build_rules.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" -diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake -index 52f2c7e1..11e9332b 100644 ---- a/configs/azure_c_shared_utilityConfig.cmake -+++ b/configs/azure_c_shared_utilityConfig.cmake -@@ -1,6 +1,14 @@ - #Copyright (c) Microsoft. All rights reserved. - #Licensed under the MIT license. See LICENSE file in the project root for full license information. - -+include(CMakeFindDependencyMacro) -+if("@use_openssl@") -+ find_dependency(OpenSSL) -+endif() -+if(UNIX AND NOT "@use_builtin_httpapi@") -+ find_dependency(CURL) -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/azure_c_shared_utilityTargets.cmake") - - get_target_property(AZURE_C_SHARED_UTILITY_INCLUDES aziotsharedutil INTERFACE_INCLUDE_DIRECTORIES) diff --git a/ports/azure-c-shared-utility/modify-POSIX-c-version.patch b/ports/azure-c-shared-utility/modify-POSIX-c-version.patch new file mode 100644 index 0000000000..f9f34cc47a --- /dev/null +++ b/ports/azure-c-shared-utility/modify-POSIX-c-version.patch @@ -0,0 +1,13 @@ +diff --git a/configs/azure_iot_build_rules.cmake b/configs/azure_iot_build_rules.cmake +index 2f7e4ae..00c94c7 100644 +--- a/configs/azure_iot_build_rules.cmake ++++ b/configs/azure_iot_build_rules.cmake +@@ -73,7 +73,7 @@ if(MSVC) + elseif(UNIX) #LINUX OR APPLE + if(NOT (IN_OPENWRT OR APPLE)) + # _XOPEN_SOURCE=500 is required for glibc to expose random and srandom. +- set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500 ${CMAKE_C_FLAGS}") ++ set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500 ${CMAKE_C_FLAGS}") + endif() + endif() + diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 1cbc58a00f..4ceaf83f16 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( fix-utilityFunctions-conditions.patch disable-error.patch improve-dependencies.patch + modify-POSIX-c-version.patch ) vcpkg_cmake_configure( @@ -32,6 +33,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_ file(COPY "${SOURCE_PATH}/configs/azure_iot_build_rules.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_copy_pdbs() diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index 37df568a18..79b0de0202 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-c-shared-utility", "version-date": "2024-03-04", + "port-version": 1, "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", "license": "MIT", diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index 5f1e7f5fe6..a60c25927d 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c18e2dd296b8982c302f6a13ddfe413f91af8da", + "version-date": "2024-03-04", + "port-version": 1 + }, { "git-tree": "74412552223e3f64edea53ad4ad5d6dc55c0b443", "version-date": "2024-03-04", diff --git a/versions/baseline.json b/versions/baseline.json index fc5fab6770..52c2591cce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -434,7 +434,7 @@ }, "azure-c-shared-utility": { "baseline": "2024-03-04", - "port-version": 0 + "port-version": 1 }, "azure-core-amqp-cpp": { "baseline": "1.0.0-beta.8",