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 5 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 port_versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3646,7 +3646,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 port_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": "5baf785bf784522fc92a057782f0cb1b646d78bf",
"version-string": "2.24.0",
"port-version": 2
},
{
"git-tree": "8b510a700284731a6f552ff2cd874794af4032ff",
"version-string": "2.24.0",
Expand Down
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
36 changes: 22 additions & 14 deletions ports/mbedtls/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,36 @@ vcpkg_fail_port_install(ON_TARGET "uwp")
set(VCPKG_LIBRARY_LINKAGE static)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ARMmbed/mbedtls
REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0
SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07
HEAD_REF master
PATCHES
OUT_SOURCE_PATH SOURCE_PATH
ahmedyarub marked this conversation as resolved.
Show resolved Hide resolved
REPO ARMmbed/mbedtls
REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0
SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07
HEAD_REF master
PATCHES
enable-pthread.patch
)

vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
pthreads ENABLE_PTHREAD
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
pthreads ENABLE_PTHREAD
)

if (VCPKG_TARGET_IS_ANDROID)
set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE"
"-DTARGET_ARCH=ANDROID"
"-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
)
endif ()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
${FEATURE_OPTIONS}
-DENABLE_TESTING=OFF
-DENABLE_PROGRAMS=OFF
${EXTRA_ARGS}
)

vcpkg_install_cmake()
Expand All @@ -33,8 +41,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()