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/aws-sdk-cpp | |
| 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/aws-sdk-cpp')
| -rw-r--r-- | ports/aws-sdk-cpp/portfile.cmake | 16 | ||||
| -rw-r--r-- | ports/aws-sdk-cpp/vcpkg.in.json | 2 | ||||
| -rw-r--r-- | ports/aws-sdk-cpp/vcpkg.json | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index f9d66a54f..e2edfda14 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -17,8 +17,23 @@ set(BUILD_ONLY core) include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
+set(EXTRA_ARGS)
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
set(rpath "@loader_path")
+elseif (VCPKG_TARGET_IS_ANDROID)
+ set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID"
+ "-DGIT_EXECUTABLE=--invalid-git-executable--"
+ "-DGIT_FOUND=TRUE"
+ "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}"
+ "-DANDROID_BUILD_ZLIB=FALSE"
+ "-DANDROID_BUILD_CURL=FALSE"
+ "-DANDROID_BUILD_OPENSSL=FALSE"
+ "-DENABLE_HW_OPTIMIZATION=OFF"
+ "-DCURL_HAS_H2_EXITCODE=0"
+ "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
+ "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
+ "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
+ )
else()
set(rpath "\$ORIGIN")
endif()
@@ -27,6 +42,7 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
+ ${EXTRA_ARGS}
-DENABLE_UNITY_BUILD=ON
-DENABLE_TESTING=OFF
-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}
diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json index d0edaef42..5bdb4c441 100644 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -1,7 +1,7 @@ { "name": "aws-sdk-cpp", "version": "1.8.126", - "port-version": 7, + "port-version": 8, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "dependencies": [ diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 5aac8ad57..02bb0315a 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aws-sdk-cpp", "version": "1.8.126", - "port-version": 7, + "port-version": 8, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "dependencies": [ |