Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Mbed TLS build for Android #15680

Merged
merged 23 commits into from
Jan 25, 2021
Merged

Fix Mbed TLS build for Android #15680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
24fbd07
Fix Mbed TLS build for Android
ahmedalnuaimi Jan 15, 2021
0669906
Fix Mbed TLS build for Android
ahmedalnuaimi Jan 16, 2021
4498ada
Merge branch 'master' of https://github.com/Microsoft/vcpkg into mbed…
ahmedalnuaimi Jan 18, 2021
97209fd
Fix libssh build for Android
ahmedalnuaimi Jan 18, 2021
eeda15a
update baseline
Jan 18, 2021
bde18a8
Remove redundant parameter
ahmedalnuaimi Jan 20, 2021
26c4ff6
Fix version
ahmedalnuaimi Jan 20, 2021
d2a44dc
Merge remote-tracking branch 'ahmedyarub/mbedtls_android' into mbedtl…
ahmedalnuaimi Jan 20, 2021
9923a37
Fix version
ahmedalnuaimi Jan 20, 2021
6cc7df9
Fix paramters
ahmedalnuaimi Jan 20, 2021
7f327c5
Fix version
ahmedalnuaimi Jan 20, 2021
6899d2e
Merge branch 'master' of https://github.com/Microsoft/vcpkg into mbed…
ahmedalnuaimi Jan 20, 2021
0a8f16c
Better Android support
ahmedalnuaimi Jan 20, 2021
a93e67f
Fix version
ahmedalnuaimi Jan 20, 2021
7ffa7eb
Merge branch 'master' of https://github.com/Microsoft/vcpkg into mbed…
ahmedalnuaimi Jan 21, 2021
3f7535d
Disable warnings as errors for Mbed TLS
ahmedalnuaimi Jan 21, 2021
d8dfb5d
Restore formatting
ahmedalnuaimi Jan 21, 2021
e517023
Fix version files
ahmedalnuaimi Jan 21, 2021
d7ee265
Merge remote-tracking branch 'upstream/master' into HEAD
strega-nil Jan 21, 2021
124d0cd
Merge branch 'master' of https://github.com/Microsoft/vcpkg into mbed…
ahmedalnuaimi Jan 21, 2021
1340c8d
Merge remote-tracking branch 'ahmedyarub/mbedtls_android' into mbedtl…
ahmedalnuaimi Jan 21, 2021
d8de879
Merge branch 'master' of https://github.com/Microsoft/vcpkg into mbed…
ahmedalnuaimi Jan 21, 2021
a244eaa
Merge branch 'master' of https://github.com/Microsoft/vcpkg into mbed…
ahmedalnuaimi Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/mbedtls/CONTROL
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3654,7 +3654,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
View file
Open in desktop
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