diff options
| author | Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com> | 2021-04-19 21:08:51 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 17:08:51 -0700 |
| commit | fe25e8ede8c21abec38e5af46ca85093fba18596 (patch) | |
| tree | 0c3abc8626c5e6847908ed7dc4ff41c0a0ee06d0 /ports/libssh | |
| parent | f9bd4c8740f3f4e5261eb5df2aeefaff1f1571d0 (diff) | |
| download | vcpkg-fe25e8ede8c21abec38e5af46ca85093fba18596.tar.gz vcpkg-fe25e8ede8c21abec38e5af46ca85093fba18596.zip | |
[aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (#15725)
* Fix Android build
* Add versioning support
* Disable building tests for cURL
* Fix patch file
* Fix patch file
* Fix patch file
* Fix versioning
* Fix patch file
* [aws-sdk-cpp] Update patch
* update baseline
* Fix dependencies
* Simplify Android configuration
* Simplify Android configuration
* Simplify Android configuration
Add alternative Git CMake script
* Bump port version
* Bump version files
* Remove redundant file
* Bump port version
* Fix version files
* Do not build curl, zlib and OpenSSL
* Typo de pkgconfig script
* Fix cURL build for Android
* Add required flags
* Revert macro change
* Fix curl build for other platforms
* Fix curl build for other platforms
* [vcpkg baseline][gsoap] Update to 2.8.111
* Update versions
* [ktx/otl] Update download hash
* update version record
* Fix curl build for other platforms
* Update ports/aws-sdk-cpp/portfile.cmake
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Update ports/aws-sdk-cpp/portfile.cmake
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Remove FingGit
* Fix configuration step
* Bump cURL port version
* Bump cURL port version
* Bump AWS SDK C++ version
* Bump AWS SDK C++ version
* Bump AWS SDK C++ version
* Bump AWS SDK C++ version
* Update ports/curl/CONTROL
* Update ports/curl/portfile.cmake
* update baseline record
* Fix Git
* update version record
* Typo
* Fix cross-platform builds of OpenSSL on MinGW/Windows
* Update version
* Fix version
* update doc
* Update ports/aws-sdk-cpp/portfile.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Update ports/aws-sdk-cpp/portfile.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Add debug libraries to curl for Android
Simplify OpenSSL patch for curl
Update OpenSSL's port version
* Update aws-sdk-cpp, curl, and OpenSSL versions
* Fix libssh after latest update
* Update libssh version
* Update libssh version
* Update ports/libssh/portfile.cmake
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* Update ports/curl/portfile.cmake
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* Update ports/libssh/portfile.cmake
* Apply suggestions from code review
* Use correct variables for OpenSSL libraries when building curl for Android
Fix zlib building for Android
Remove redundant patch comments
* Bump zlib's port version
* Update zlib, libssh, and curl versions
* [vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path
* update version record
* Update versions/o-/openssl.json
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/libssh')
| -rw-r--r-- | ports/libssh/0002-mingw_for_Android.patch | 12 | ||||
| -rw-r--r-- | ports/libssh/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libssh/portfile.cmake | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ports/libssh/0002-mingw_for_Android.patch b/ports/libssh/0002-mingw_for_Android.patch new file mode 100644 index 000000000..e0e3472b1 --- /dev/null +++ b/ports/libssh/0002-mingw_for_Android.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt (revision 0cceefd49d4d397eb21bd36e314ac87739da51ff) ++++ b/src/CMakeLists.txt (date 1617870624653) +@@ -361,7 +361,7 @@ + set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") + endif (WITH_VISIBILITY_HIDDEN) + +-if (MINGW) ++if (MINGW AND NOT ANDROID) + set_target_properties(ssh PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup") + set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-D_POSIX_SOURCE") + endif () diff --git a/ports/libssh/CONTROL b/ports/libssh/CONTROL index 0a138fcd9..975903356 100644 --- a/ports/libssh/CONTROL +++ b/ports/libssh/CONTROL @@ -1,6 +1,6 @@ Source: libssh Version: 0.9.5 -Port-Version: 2 +Port-Version: 3 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 diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index a35ee1162..cbacd542b 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_git( SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18 PATCHES 0001-export-pkgconfig-file.patch + 0002-mingw_for_Android.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS |