Skip to content

Commit

Permalink
Fix Mbed TLS build for Android (#15680)
Browse files Browse the repository at this point in the history
* Fix Mbed TLS build for Android

* Fix Mbed TLS build for Android
Add better Windows checks

* Fix libssh build for Android

* update baseline

* Remove redundant parameter

* Fix version

* Fix version

* Fix paramters

* Fix version

* Better Android support

* Fix version

* Disable warnings as errors for Mbed TLS

* Restore formatting

* Fix version files

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
  • Loading branch information
4 people committed Jan 25, 2021
1 parent e263d00 commit be2092a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ports/mbedtls/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: mbedtls
Version: 2.24.0
Port-Version: 1
Port-Version: 2
Homepage: https://github.com/ARMmbed/mbedtls
Description: An open source, portable, easy to use, readable and flexible SSL library
Supports: !uwp
Expand Down
5 changes: 3 additions & 2 deletions ports/mbedtls/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ vcpkg_configure_cmake(
${FEATURE_OPTIONS}
-DENABLE_TESTING=OFF
-DENABLE_PROGRAMS=OFF
-DMBEDTLS_FATAL_WARNINGS=FALSE
)

vcpkg_install_cmake()
Expand All @@ -33,8 +34,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

if(WIN32 AND pthreads IN_LIST FEATURES)
if (VCPKG_TARGET_IS_WINDOWS AND pthreads IN_LIST FEATURES)
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
endif()
endif ()

vcpkg_copy_pdbs()
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3658,7 +3658,7 @@
},
"mbedtls": {
"baseline": "2.24.0",
"port-version": 1
"port-version": 2
},
"mcpp": {
"baseline": "2.7.2.14",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mbedtls.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47",
"version-string": "2.24.0",
"port-version": 2
},
{
"git-tree": "8b510a700284731a6f552ff2cd874794af4032ff",
"version-string": "2.24.0",
Expand Down

0 comments on commit be2092a

Please sign in to comment.