diff options
| author | Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com> | 2021-01-25 04:42:44 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 23:42:44 -0800 |
| commit | b7c8a3097d8aaafd0065852ad028857a02eab4b6 (patch) | |
| tree | a913515b7539ad8a273e68743e107ef6d089d07b | |
| parent | be2092af4e6f7649dee37969104f93f68c3945fc (diff) | |
| download | vcpkg-b7c8a3097d8aaafd0065852ad028857a02eab4b6.tar.gz vcpkg-b7c8a3097d8aaafd0065852ad028857a02eab4b6.zip | |
[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>
| -rw-r--r-- | ports/libssh/CONTROL | 4 | ||||
| -rw-r--r-- | ports/libssh/portfile.cmake | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libssh.json | 5 |
4 files changed, 16 insertions, 2 deletions
diff --git a/ports/libssh/CONTROL b/ports/libssh/CONTROL index fbee566de..d1e607e8c 100644 --- a/ports/libssh/CONTROL +++ b/ports/libssh/CONTROL @@ -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 diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index 3874d1939..ee7f0ac8f 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -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 diff --git a/versions/baseline.json b/versions/baseline.json index a06db4fb0..8afed10c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3350,7 +3350,7 @@ }, "libssh": { "baseline": "0.9.5", - "port-version": 0 + "port-version": 1 }, "libssh2": { "baseline": "1.9.0", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index 2aa48093d..117d34e07 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "bf1fb5ae9324823a60784a5ed0ecbca8a3325214", + "version-string": "0.9.5", + "port-version": 1 + }, + { "git-tree": "a9db7620dc774257483a98c9c5309dbb7eff8263", "version-string": "0.9.5", "port-version": 0 |