aboutsummaryrefslogtreecommitdiff
path: root/ports/azure-storage-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ports/azure-storage-cpp')
-rw-r--r--ports/azure-storage-cpp/CONTROL4
-rw-r--r--ports/azure-storage-cpp/cmake.patch169
-rw-r--r--ports/azure-storage-cpp/glibmm-cmake.patch13
-rw-r--r--ports/azure-storage-cpp/portfile.cmake8
-rw-r--r--ports/azure-storage-cpp/static-builds.patch13
-rw-r--r--ports/azure-storage-cpp/support-cpprest-findpackage.patch32
6 files changed, 4 insertions, 235 deletions
diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
index c68552bba..d6e0080db 100644
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@@ -1,5 +1,5 @@
Source: azure-storage-cpp
-Version: 3.2.1
-Build-Depends: cpprestsdk, atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), glibmm (!windows&!uwp), libxmlpp (!windows&!uwp), libuuid (!windows&!uwp)
+Version: 5.2.0
+Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp)
Description: Microsoft Azure Storage Client SDK for C++
A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/
diff --git a/ports/azure-storage-cpp/cmake.patch b/ports/azure-storage-cpp/cmake.patch
deleted file mode 100644
index 96fdace2d..000000000
--- a/ports/azure-storage-cpp/cmake.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-index 07878c2..8d1c47e 100644
---- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-@@ -51,20 +51,25 @@ if(UNIX)
- find_package(UnitTest++ REQUIRED)
- endif()
-
-- option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
-
-- file(GLOB WAS_HEADERS includes/was/*.h)
-- install(FILES ${WAS_HEADERS} DESTINATION include/was)
-- file(GLOB WASCORE_HEADERS includes/wascore/*.h)
-- install(FILES ${WASCORE_HEADERS} DESTINATION include/wascore)
-- file(GLOB WASCORE_DATA includes/wascore/*.dat)
-- install(FILES ${WASCORE_DATA} DESTINATION include/wascore)
-+elseif(WIN32)
-+ message("-- Setting WIN32 options")
-+ find_package(Casablanca REQUIRED)
-+ add_definitions(-DUNICODE -D_UNICODE -D_WIN32)
- else()
- message("-- Unsupported Build Platform.")
- endif()
-
-+option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
-+option(WASTORE_INSTALL_HEADERS "Install header files." ON)
-+if(WASTORE_INSTALL_HEADERS)
-+ file(GLOB WAS_HEADERS includes/was/*.h)
-+ file(GLOB WASCORE_HEADERS includes/wascore/basic_types.h includes/wascore/constants.h)
-+ file(GLOB WASCORE_DATA includes/wascore/*.dat)
-+endif()
-+
- # Compiler (not platform) specific settings
--if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- message("-- Setting gcc options")
-
- set(WARNINGS "-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code")
-@@ -81,22 +86,29 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- add_definitions(-DBOOST_LOG_DYN_LINK)
- endif()
- add_definitions(-D_TURN_OFF_PLATFORM_STRING)
--elseif((CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-- message("-- Setting clang options")
-+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-+ message("-- Setting clang options")
-
-- set(WARNINGS "-Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls")
-- set(OSX_SUPPRESSIONS "-Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs")
-- set(WARNINGS "${WARNINGS} ${OSX_SUPPRESSIONS}")
-+ set(WARNINGS "-Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls")
-+ set(OSX_SUPPRESSIONS "-Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs")
-+ set(WARNINGS "${WARNINGS} ${OSX_SUPPRESSIONS}")
-
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
-- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
-+ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-+ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
-
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
-- if (BUILD_SHARED_LIBS)
-- add_definitions(-DBOOST_LOG_DYN_LINK)
-- endif()
-- add_definitions(-D_TURN_OFF_PLATFORM_STRING)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
-+ if (BUILD_SHARED_LIBS)
-+ add_definitions(-DBOOST_LOG_DYN_LINK)
-+ endif()
-+ add_definitions(-D_TURN_OFF_PLATFORM_STRING)
-+elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-+ message("-- Setting MSVC options")
-+ add_compile_options(/bigobj)
-+ add_compile_options(/MP)
-+ if(BUILD_SHARED_LIBS)
-+ add_definitions(-DWASTORAGE_DLL -D_USRDLL)
-+ endif()
- else()
- message("-- Unknown compiler, success is doubtful.")
- endif()
-@@ -109,7 +121,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
- set(AZURESTORAGE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/includes)
- set(AZURESTORAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes ${CASABLANCA_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ${LibXML++_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${Glibmm_INCLUDE_DIRS})
-
--
- set(AZURESTORAGE_LIBRARY azurestorage)
- set(AZURESTORAGE_LIBRARIES ${AZURESTORAGE_LIBRARY} ${CASABLANCA_LIBRARIES} ${Boost_LIBRARIES} ${Boost_FRAMEWORK} ${OPENSSL_LIBRARIES} ${LibXML++_LIBRARIES} ${UUID_LIBRARIES} ${Glibmm_LIBRARIES})
-
-diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-index 5c1df3c..da66eb4 100644
---- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-@@ -27,6 +27,7 @@ find_path(CASABLANCA_INCLUDE_DIR
- find_library(CASABLANCA_LIBRARY
- NAMES
- cpprest
-+ cpprest_2_9.lib
- PATHS
- ${CASABLANCA_PKGCONF_LIBRARY_DIRS}
- ${CASABLANCA_DIR}
-diff --git a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
-index b08111f..74ba2fb 100644
---- a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
-+++ b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
-@@ -2,7 +2,7 @@ include_directories(${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
- include_directories(${AZURESTORAGE_INCLUDE_DIRS})
-
- # THE ORDER OF FILES IS VERY /VERY/ IMPORTANT
--if(UNIX)
-+if(UNIX OR WIN32)
- set(SOURCES
- xmlhelpers.cpp
- response_parsers.cpp
-@@ -64,24 +64,46 @@ if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
- endif()
- if (APPLE)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS}")
- else()
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+endif()
-+
-+if(MSVC)
-+ add_compile_options(/Yustdafx.h)
-+ set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
-+
-+ if (NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
-+ set_property(SOURCE stdafx.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
-+ set_property(SOURCE ${SOURCES} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
-+ endif()
-+
-+ list(APPEND SOURCES stdafx.cpp)
- endif()
-
- add_library(${AZURESTORAGE_LIBRARY} ${SOURCES})
-
- target_link_libraries(${AZURESTORAGE_LIBRARIES})
-+if(WIN32)
-+ target_link_libraries(${AZURESTORAGE_LIBRARY} Ws2_32.lib rpcrt4.lib xmllite.lib bcrypt.lib)
-+endif()
-
- # Portions specific to azure storage binary versioning and installation.
- if(UNIX)
- set_target_properties(${AZURESTORAGE_LIBRARY} PROPERTIES
- SOVERSION ${AZURESTORAGE_VERSION_MAJOR}
- VERSION ${AZURESTORAGE_VERSION_MAJOR}.${AZURESTORAGE_VERSION_MINOR})
--
-- install(
-- TARGETS ${AZURESTORAGE_LIBRARY}
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-- )
-+elseif(WIN32)
-+ set_target_properties(${AZURESTORAGE_LIBRARY} PROPERTIES OUTPUT_NAME "wastorage")
- endif()
-+
-+install(FILES ${WAS_HEADERS} DESTINATION include/was)
-+install(FILES ${WASCORE_HEADERS} DESTINATION include/wascore)
-+install(FILES ${WASCORE_DATA} DESTINATION include/wascore)
-+
-+install(
-+ TARGETS ${AZURESTORAGE_LIBRARY}
-+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION lib
-+ ARCHIVE DESTINATION lib
-+)
diff --git a/ports/azure-storage-cpp/glibmm-cmake.patch b/ports/azure-storage-cpp/glibmm-cmake.patch
deleted file mode 100644
index 4d3e4a8cd..000000000
--- a/ports/azure-storage-cpp/glibmm-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
-index 79a4bcb..fe130bd 100644
---- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
-+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
-@@ -36,7 +36,7 @@ find_path(GlibmmConfig_INCLUDE_DIR
- )
-
- find_library(Glibmm_LIBRARY
-- NAMES glibmm-2.4
-+ NAMES glibmm glibmm-2.4
- PATHS
- ${Glibmm_PKGCONF_LIBRARY_DIRS}
- /usr
diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake
index 56dbc2ca3..97f27ccee 100644
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@@ -7,14 +7,10 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-storage-cpp
- REF v3.2.1
- SHA512 8d1e8de439e52f53eb28b77e8adf394468f4861c2c4c1f79ec1437c72e3fc0bc871e4e2662ee58090748915b0f12ce6736a7cc6ede619d332686b9fb6a026c9f
+ REF v5.2.0
+ SHA512 345ddfcececc7b38e65dff96c971eadc41ce7255131f1bc9995dd8fed0c69cc3b48c6838152e30c57014bf2017bde0c819a09b7d6b4abaa089a7ae023633262e
HEAD_REF master
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/cmake.patch
- ${CMAKE_CURRENT_LIST_DIR}/static-builds.patch
- ${CMAKE_CURRENT_LIST_DIR}/support-cpprest-findpackage.patch
- ${CMAKE_CURRENT_LIST_DIR}/glibmm-cmake.patch
${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch
)
diff --git a/ports/azure-storage-cpp/static-builds.patch b/ports/azure-storage-cpp/static-builds.patch
deleted file mode 100644
index 09b2f1077..000000000
--- a/ports/azure-storage-cpp/static-builds.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-index 8d1c47e..3b4d1c0 100644
---- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-@@ -108,6 +108,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
- add_compile_options(/MP)
- if(BUILD_SHARED_LIBS)
- add_definitions(-DWASTORAGE_DLL -D_USRDLL)
-+ else()
-+ add_definitions(-D_NO_WASTORAGE_API)
- endif()
- else()
- message("-- Unknown compiler, success is doubtful.")
diff --git a/ports/azure-storage-cpp/support-cpprest-findpackage.patch b/ports/azure-storage-cpp/support-cpprest-findpackage.patch
deleted file mode 100644
index 5cd805208..000000000
--- a/ports/azure-storage-cpp/support-cpprest-findpackage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-index 3b4d1c0..d8818ac 100644
---- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-@@ -1,5 +1,5 @@
- set(CMAKE_LEGACY_CYGWIN_WIN32 0)
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.8)
- project(azurestorage)
-
- enable_testing()
-diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-index da66eb4..40e1767 100644
---- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-@@ -23,6 +23,16 @@ find_path(CASABLANCA_INCLUDE_DIR
- include
- )
-
-+find_package(cpprestsdk)
-+
-+if(cpprestsdk_FOUND)
-+ set(CASABLANCA_LIBRARY cpprestsdk::cpprest)
-+ set(CASABLANCA_PROCESS_LIBS CASABLANCA_LIBRARY)
-+ set(CASABLANCA_PROCESS_INCLUDES CASABLANCA_INCLUDE_DIR)
-+ libfind_process(CASABLANCA)
-+ return()
-+endif()
-+
- # Library
- find_library(CASABLANCA_LIBRARY
- NAMES
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-12 09:28:14 +0000