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

[libssh] Add support for Android #15687

Merged
merged 66 commits into from
Jan 25, 2021
Merged

[libssh] Add support for Android #15687

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
66 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
304ce9d
Fix libssh 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
82fb090
Merge branch 'master' of https://github.com/Microsoft/vcpkg into libs…
ahmedalnuaimi Jan 18, 2021
600621c
Fix versioning
ahmedalnuaimi Jan 18, 2021
eeda15a
update baseline
Jan 18, 2021
078bfa5
Update ports/libssh/portfile.cmake
Jan 18, 2021
f125516
Update port_versions/l-/libssh.json
Jan 18, 2021
eb0d6f7
Update port_versions/baseline.json
Jan 18, 2021
bb65585
Update ports/libssh/CONTROL
NancyLi1013 Jan 18, 2021
d8adf72
Update port_versions
Jan 18, 2021
307d01c
Revert version changes to master
ahmedalnuaimi Jan 18, 2021
e307234
Update CONTROL version
ahmedalnuaimi Jan 18, 2021
6fd0a8f
Update libssh versions
ahmedalnuaimi Jan 18, 2021
b95ed36
Remove redundant parameter
ahmedalnuaimi Jan 20, 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
280a1b0
Fix dependencies
ahmedalnuaimi Jan 20, 2021
a7e3770
Merge branch 'master' of https://github.com/Microsoft/vcpkg into libs…
ahmedalnuaimi Jan 20, 2021
6899d2e
Merge branch 'master' of https://github.com/Microsoft/vcpkg into mbed…
ahmedalnuaimi Jan 20, 2021
e545956
Fix versions
ahmedalnuaimi Jan 20, 2021
0a8f16c
Better Android support
ahmedalnuaimi Jan 20, 2021
a93e67f
Fix version
ahmedalnuaimi Jan 20, 2021
cc05852
Simpler Android support
ahmedalnuaimi Jan 20, 2021
2745dfd
Fix versions
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
48549da
Merge branch 'master' of https://github.com/Microsoft/vcpkg into libs…
ahmedalnuaimi Jan 21, 2021
4971361
Update ports/libssh/CONTROL
Jan 21, 2021
8fc0d9a
Merge branch 'libssh_android' of https://github.com/ahmedyarub/vcpkg …
ahmedalnuaimi Jan 21, 2021
4fa7853
Remove redundant paramter
ahmedalnuaimi Jan 21, 2021
b9a4699
Fix version files
ahmedalnuaimi Jan 21, 2021
e517023
Fix version files
ahmedalnuaimi Jan 21, 2021
06e7b8c
Fix libssh build for Android
ahmedalnuaimi Jan 16, 2021
4dd33ec
Fix versioning
ahmedalnuaimi Jan 18, 2021
6e70493
Update ports/libssh/portfile.cmake
Jan 18, 2021
8e13431
Update port_versions/l-/libssh.json
Jan 18, 2021
e5d580b
Update port_versions/baseline.json
Jan 18, 2021
61cc95d
Update ports/libssh/CONTROL
NancyLi1013 Jan 18, 2021
db70ee5
Update port_versions
Jan 18, 2021
00f2507
Revert version changes to master
ahmedalnuaimi Jan 18, 2021
9c4abc6
Update CONTROL version
ahmedalnuaimi Jan 18, 2021
5df0816
Update libssh versions
ahmedalnuaimi Jan 18, 2021
74f6bbb
Remove redundant parameter
ahmedalnuaimi Jan 20, 2021
a5c9fba
Fix dependencies
ahmedalnuaimi Jan 20, 2021
6e3dced
Fix versions
ahmedalnuaimi Jan 20, 2021
f6dc7f1
Simpler Android support
ahmedalnuaimi Jan 20, 2021
a66c41d
Fix versions
ahmedalnuaimi Jan 20, 2021
e6f7f40
Update ports/libssh/CONTROL
Jan 21, 2021
5e99674
Remove redundant paramter
ahmedalnuaimi Jan 21, 2021
c0c16f8
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
3fd7142
Merge branch 'master' of https://github.com/Microsoft/vcpkg into libs…
ahmedalnuaimi Jan 21, 2021
40b5a26
Merge branch 'libssh_android' of https://github.com/ahmedyarub/vcpkg …
ahmedalnuaimi Jan 21, 2021
d8de879
Merge branch 'master' of https://github.com/Microsoft/vcpkg into mbed…
ahmedalnuaimi Jan 21, 2021
318b318
Merge branch 'master' of https://github.com/Microsoft/vcpkg into libs…
ahmedalnuaimi Jan 22, 2021
0f0d8d7
Merge branch 'mbedtls_android' into libssh_android
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 @@ -3338,7 +3338,7 @@
},
"libssh": {
"baseline": "0.9.5",
"port-version": 0
"port-version": 1
},
"libssh2": {
"baseline": "1.9.0",
Expand Down
5 changes: 5 additions & 0 deletions port_versions/l-/libssh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3377cffea59634bbc1bdef43c2ad618e7165d88a",
"version-string": "0.9.5",
"port-version": 1
},
{
"git-tree": "a9db7620dc774257483a98c9c5309dbb7eff8263",
"version-string": "0.9.5",
Expand Down
1 change: 1 addition & 0 deletions ports/libssh/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: libssh
Version: 0.9.5
Port-Version: 1
Homepage: https://www.libssh.org/
Description: libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side
Default-Features: crypto
Expand Down
10 changes: 10 additions & 0 deletions ports/libssh/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
zlib WITH_ZLIB
)

if (VCPKG_TARGET_IS_ANDROID)
set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID"
ahmedyarub marked this conversation as resolved.
Show resolved Hide resolved
"-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
ahmedyarub marked this conversation as resolved.
Show resolved Hide resolved
"-DWITH_MBEDTLS=TRUE"
ahmedyarub marked this conversation as resolved.
Show resolved Hide resolved
"-DWITH_SERVER=FALSE"
"-DWITH_PCAP=FALSE"
)
endif ()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
${EXTRA_ARGS}
${FEATURE_OPTIONS}
-DWITH_EXAMPLES=OFF
-DUNIT_TESTING=OFF
Expand Down