diff options
| author | Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com> | 2021-01-25 04:37:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 23:37:22 -0800 |
| commit | be2092af4e6f7649dee37969104f93f68c3945fc (patch) | |
| tree | 862c7075b509c465f4d29dc59250dcda90db66f8 | |
| parent | e263d00933414bb1cd84be4bd6e4f43c4bc03ce9 (diff) | |
| download | vcpkg-be2092af4e6f7649dee37969104f93f68c3945fc.tar.gz vcpkg-be2092af4e6f7649dee37969104f93f68c3945fc.zip | |
Fix Mbed TLS build for Android (#15680)
* 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>
| -rw-r--r-- | ports/mbedtls/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mbedtls/portfile.cmake | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/mbedtls.json | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL index 74164ea10..dc8bded7b 100644 --- a/ports/mbedtls/CONTROL +++ b/ports/mbedtls/CONTROL @@ -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 diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 196f7c08b..3bd961fbc 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -25,6 +25,7 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF + -DMBEDTLS_FATAL_WARNINGS=FALSE ) vcpkg_install_cmake() @@ -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()
\ No newline at end of file diff --git a/versions/baseline.json b/versions/baseline.json index 7565cc7ba..a06db4fb0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3658,7 +3658,7 @@ }, "mbedtls": { "baseline": "2.24.0", - "port-version": 1 + "port-version": 2 }, "mcpp": { "baseline": "2.7.2.14", diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index 4eb92bc59..6498c4d2c 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47", + "version-string": "2.24.0", + "port-version": 2 + }, + { "git-tree": "8b510a700284731a6f552ff2cd874794af4032ff", "version-string": "2.24.0", "port-version": 1 |