diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/azure-c-shared-utility | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/azure-c-shared-utility')
| -rw-r--r-- | ports/azure-c-shared-utility/CONTROL | 2 | ||||
| -rw-r--r-- | ports/azure-c-shared-utility/no-double-expand-cmake.patch | 13 | ||||
| -rw-r--r-- | ports/azure-c-shared-utility/portfile.cmake | 3 |
3 files changed, 1 insertions, 17 deletions
diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 40cf38523..e056a965d 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,5 +1,5 @@ Source: azure-c-shared-utility -Version: 2019-08-20.1 +Version: 2019-08-20.1-1 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c diff --git a/ports/azure-c-shared-utility/no-double-expand-cmake.patch b/ports/azure-c-shared-utility/no-double-expand-cmake.patch deleted file mode 100644 index 3775ad6b5..000000000 --- a/ports/azure-c-shared-utility/no-double-expand-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 190ea87..a434cee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -264,7 +264,7 @@ if(${use_applessl})
- include_directories(./pal/ios-osx/)
- endif()
-
--if (WIN32 AND (${CMAKE_SYSTEM_VERSION} VERSION_EQUAL "10.0.17763.0" OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.0.17763.0"))
-+if (WIN32 AND (CMAKE_SYSTEM_VERSION VERSION_EQUAL "10.0.17763.0" OR CMAKE_SYSTEM_VERSION VERSION_GREATER "10.0.17763.0"))
- # Windows added support for UNIX domain sockets to the OS and SDK
- # in the Oct 2018 update (10.0.17763.0, aka RS5)
- add_definitions(-DAF_UNIX_ON_WINDOWS)
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 3b95bd6dd..38c69bf6e 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -9,7 +9,6 @@ if("public-preview" IN_LIST FEATURES) REF 1f3fd807c8c47b6607d349469301afb64643aa89 SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2 HEAD_REF master - PATCHES no-double-expand-cmake.patch ) else() vcpkg_from_github( @@ -18,7 +17,6 @@ else() REF 1f3fd807c8c47b6607d349469301afb64643aa89 SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2 HEAD_REF master - PATCHES no-double-expand-cmake.patch ) endif() @@ -43,4 +41,3 @@ file(COPY ${SOURCE_PATH}/configs/azure_iot_build_rules.cmake DESTINATION ${CURRE configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility/copyright COPYONLY) vcpkg_copy_pdbs() - |