[azure-iot-sdk] Upgrades

4 files changed, 24 insertions, 45 deletions

diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index 72ecadfca..a706b195c 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-iot-sdk-c
-Version: 1.2.2
+Version: 1.2.3
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
diff --git a/ports/azure-iot-sdk-c/improve-external-deps-2.patch b/ports/azure-iot-sdk-c/improve-external-deps-2.patch
new file mode 100644
index 000000000..04795fa1f
--- /dev/null
+++ b/ports/azure-iot-sdk-c/improve-external-deps-2.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index aa2dfad..f1656ea 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -129,15 +129,6 @@ endif()

+ #Use solution folders.

+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)

+ 

+-# build the parson library for json parsing

+-add_library(parson

+-    ./deps/parson/parson.c

+-    ./deps/parson/parson.h

+-)

+-if(MSVC)

+-    set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")

+-endif()

+-

+ if(IN_OPENWRT)

+     ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")

+     INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")

diff --git a/ports/azure-iot-sdk-c/improve-external-deps.patch b/ports/azure-iot-sdk-c/improve-external-deps.patch
index 5af7ef29e..d96e0fe38 100644
--- a/ports/azure-iot-sdk-c/improve-external-deps.patch
+++ b/ports/azure-iot-sdk-c/improve-external-deps.patch
@@ -26,33 +26,6 @@ index 063733a..71bfc7d 100644
  else()

      add_subdirectory(c-utility)

  

-diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt

-index e6d000a..70ade26 100644

---- a/iothub_client/CMakeLists.txt

-+++ b/iothub_client/CMakeLists.txt

-@@ -24,22 +24,6 @@ set(install_staticlibs

-     iothub_client

- )

- 

--add_library(parson

--    ../deps/parson/parson.c

--)

--

--if(MSVC)

--    set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")

--endif()

--

--set(install_staticlibs ${install_staticlibs}

--    parson

--)

--

--set(iothub_client_libs ${iothub_client_libs}

--    parson

--)

--

- if(NOT dont_use_uploadtoblob)

-     set(iothub_client_ll_transport_c_files

-         ${iothub_client_ll_transport_c_files}

 diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt

 index 161872a..d53e111 100644

 --- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt

@@ -119,18 +92,3 @@ index 11a9a9a..4097293 100644
  endif()

  

  if (NOT ${ARCHITECTURE} STREQUAL "ARM")

-diff --git a/serializer/CMakeLists.txt b/serializer/CMakeLists.txt

-index 0f6dc74..b4f784c 100644

---- a/serializer/CMakeLists.txt

-+++ b/serializer/CMakeLists.txt

-@@ -87,10 +87,6 @@ else()

- endif()

- setSdkTargetBuildProperties(serializer)

- 

--target_link_libraries(serializer

--    parson

--)

--

- if (NOT ${skip_samples})

- if(WIN32)

-     if (NOT ${ARCHITECTURE} STREQUAL "ARM")

diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index a1e864ab2..0abffcb0f 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-iot-sdk-c
-    REF 1.2.2
-    SHA512 1542f8347e5efc3104eacf1696b84739299bedb4f50dce3869b3a53072b5c016aadf34223658c18fe28e87eab775a0687b5bf18b5629a7a87b8709b123b3599a
+    REF 1.2.3
+    SHA512 6192d454bb2ecb01989f7636751acd6919021b55b772f4ea25a6d0ddd263e7f988275f7fb0b1c304d4ebd30418c9f870eb1c504a4a504f2faeb712ef8e669d5a
     HEAD_REF master
 )
 
@@ -17,6 +17,7 @@ vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/improve-external-deps.patch
+        ${CMAKE_CURRENT_LIST_DIR}/improve-external-deps-2.patch
 )
 
 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)