[libssh] Add support for Android (#15687)

* Fix Mbed TLS build for Android

* Fix Mbed TLS build for Android
Add better Windows checks

* Fix libssh build for Android

* Fix libssh build for Android

* Fix versioning

* update baseline

* Update ports/libssh/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update port_versions/l-/libssh.json

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update port_versions/baseline.json

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/libssh/CONTROL

* Update port_versions

* Revert version changes to master

* Update CONTROL version

* Update libssh versions

* Remove redundant parameter

* Remove redundant parameter

* Fix version

* Fix version

* Fix paramters

* Fix version

* Fix dependencies

* Fix versions

* Better Android support

* Fix version

* Simpler Android support

* Fix versions

* Disable warnings as errors for Mbed TLS

* Restore formatting

* Update ports/libssh/CONTROL

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Remove redundant paramter

* Fix version files

* Fix version files

* Fix libssh build for Android

* Fix versioning

* Update ports/libssh/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update port_versions/l-/libssh.json

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update port_versions/baseline.json

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/libssh/CONTROL

* Update port_versions

* Revert version changes to master

* Update CONTROL version

* Update libssh versions

* Remove redundant parameter

* Fix dependencies

* Fix versions

* Simpler Android support

* Fix versions

* Update ports/libssh/CONTROL

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Remove redundant paramter

* 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: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
This commit is contained in:
Ahmed Yarub Hani Al Nuaimi 2021-01-25 04:42:44 -03:00 коммит произвёл GitHub
Родитель be2092af4e
Коммит b7c8a3097d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 16 добавлений и 2 удалений

Просмотреть файл

@ -1,6 +1,8 @@
Source: libssh
Version: 0.9.5
Port-Version: 1
Homepage: https://www.libssh.org/
Build-Depends: libssh[core,mbedtls] (android)
Description: libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side
Default-Features: crypto
Supports: !uwp
@ -10,7 +12,7 @@ Build-Depends: libssh[mbedtls]
Description: Default crypto backend
Feature: mbedtls
Build-Depends: mbedtls[pthreads]
Build-Depends: mbedtls[pthreads] (!android), mbedtls[core]
Description: Crypto support (mbedTLS)
Feature: openssl

Просмотреть файл

@ -19,10 +19,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
zlib WITH_ZLIB
)
if (VCPKG_TARGET_IS_ANDROID)
set(EXTRA_ARGS "-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

Просмотреть файл

@ -3350,7 +3350,7 @@
},
"libssh": {
"baseline": "0.9.5",
"port-version": 0
"port-version": 1
},
"libssh2": {
"baseline": "1.9.0",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bf1fb5ae9324823a60784a5ed0ecbca8a3325214",
"version-string": "0.9.5",
"port-version": 1
},
{
"git-tree": "a9db7620dc774257483a98c9c5309dbb7eff8263",
"version-string": "0.9.5",