[aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android by ahmedyarub · Pull Request #15725 · microsoft/vcpkg

ahmedyarub · 2021-01-18T07:10:37Z

Describe the pull request
Adds toolchain chaining to external builds

What does your PR fix? Fixes #
Fixes Android builds. Same solution can be used in the future for any cross-platform builds.
Which triplets are supported/not supported? Have you updated the CI baseline?
x64-Android
Does your PR follow the maintainer guide?
Yes

ports/aws-sdk-cpp/allow-vcpkg-chaining.patch

ahmedyarub · 2021-01-18T16:26:13Z

Done

JackBoosY · 2021-01-19T01:46:23Z

CMake Error at scripts/cmake/vcpkg_apply_patches.cmake:63 (message):
  Applying patch failed.  error: corrupt patch at line 70

Call Stack (most recent call first):
  scripts/cmake/vcpkg_extract_source_archive_ex.cmake:145 (vcpkg_apply_patches)

ahmedyarub · 2021-01-19T01:47:00Z

CMake Error at scripts/cmake/vcpkg_apply_patches.cmake:63 (message):
  Applying patch failed.  error: corrupt patch at line 70

Call Stack (most recent call first):
  scripts/cmake/vcpkg_extract_source_archive_ex.cmake:145 (vcpkg_apply_patches)

I'm struggling to fix it but I don't understand why it works in some envs and not in others!

ports/aws-sdk-cpp/portfile.cmake

JackBoosY · 2021-01-19T03:15:14Z

@ahmedyarub Is my patch correct?

ahmedyarub · 2021-01-19T03:56:39Z

@ahmedyarub Is my patch correct?

Yes! I've just tested it. Thank you very much.

JackBoosY · 2021-01-19T05:35:04Z

Need test all features.

JackBoosY · 2021-01-19T05:54:11Z

When building aws-sdk-cpp[*]:x86-windows:

[391/413] "C:\PROGRA~2\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x86\cl.exe"   /TP -DAWS_CHECKSUMS_USE_IMPORT_EXPORT -DAWS_COMMON_USE_IMPORT_EXPORT -DAWS_EVENT_STREAM_USE_IMPORT_EXPORT -DAWS_SDK_VERSION_MAJOR=1 -DAWS_SDK_VERSION_MINOR=8 -DAWS_SDK_VERSION_PATCH=83 -DAWS_TRANSFER_EXPORTS -DENABLE_BCRYPT_ENCRYPTION -DENABLE_WINDOWS_CLIENT -DPLATFORM_WINDOWS -DUSE_IMPORT_EXPORT=1 -DUSE_WINDOWS_DLL_SEMANTICS -Daws_cpp_sdk_transfer_EXPORTS -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\include -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-s3\include -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-core\include -IG:\15725\vcpkg\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W4 /utf-8 /GR /EHsc /MP  /MP /bigobj /WX /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Foaws-cpp-sdk-transfer\CMakeFiles\aws-cpp-sdk-transfer.dir\source\transfer\TransferManager.cpp.obj /Fdaws-cpp-sdk-transfer\CMakeFiles\aws-cpp-sdk-transfer.dir\ /FS -c G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp
FAILED: aws-cpp-sdk-transfer/CMakeFiles/aws-cpp-sdk-transfer.dir/source/transfer/TransferManager.cpp.obj 
"C:\PROGRA~2\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x86\cl.exe"   /TP -DAWS_CHECKSUMS_USE_IMPORT_EXPORT -DAWS_COMMON_USE_IMPORT_EXPORT -DAWS_EVENT_STREAM_USE_IMPORT_EXPORT -DAWS_SDK_VERSION_MAJOR=1 -DAWS_SDK_VERSION_MINOR=8 -DAWS_SDK_VERSION_PATCH=83 -DAWS_TRANSFER_EXPORTS -DENABLE_BCRYPT_ENCRYPTION -DENABLE_WINDOWS_CLIENT -DPLATFORM_WINDOWS -DUSE_IMPORT_EXPORT=1 -DUSE_WINDOWS_DLL_SEMANTICS -Daws_cpp_sdk_transfer_EXPORTS -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\include -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-s3\include -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-core\include -IG:\15725\vcpkg\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W4 /utf-8 /GR /EHsc /MP  /MP /bigobj /WX /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Foaws-cpp-sdk-transfer\CMakeFiles\aws-cpp-sdk-transfer.dir\source\transfer\TransferManager.cpp.obj /Fdaws-cpp-sdk-transfer\CMakeFiles\aws-cpp-sdk-transfer.dir\ /FS -c G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(772): error C2220: warning treated as error - no 'object' file generated
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(772): warning C4244: 'initializing': conversion from 'const _Ty' to 'size_t', possible loss of data
        with
        [
            _Ty=uint64_t
        ]
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(777): warning C4244: 'initializing': conversion from 'uint64_t' to 'size_t', possible loss of data
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(927): warning C4244: 'argument': conversion from 'uint64_t' to 'size_t', possible loss of data
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-core\include\aws/core/utils/memory/AWSMemory.h(66): warning C4244: 'argument': conversion from '_Ty' to 'size_t', possible loss of data
        with
        [
            _Ty=uint64_t
        ]
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-core\include\aws/core/utils/memory/AWSMemory.h(258): note: see reference to function template instantiation 'T *Aws::New<T,const _Ty&,unsigned __int64>(const char *,const _Ty &,unsigned __int64 &&)' being compiled
        with
        [
            T=Aws::Utils::Stream::PreallocatedStreamBuf,
            _Ty=unsigned char *
        ]
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(827): note: see reference to function template instantiation 'std::unique_ptr<Aws::Utils::Stream::PreallocatedStreamBuf,Aws::Deleter<Aws::Utils::Stream::PreallocatedStreamBuf>> Aws::MakeUnique<Aws::Utils::Stream::PreallocatedStreamBuf,const RESOURCE_TYPE&,uint64_t>(const char *,const RESOURCE_TYPE &,uint64_t &&)' being compiled
        with
        [
            RESOURCE_TYPE=unsigned char *
        ]

ahmedyarub · 2021-01-19T06:56:48Z

When building aws-sdk-cpp[*]:x86-windows:

[391/413] "C:\PROGRA~2\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x86\cl.exe"   /TP -DAWS_CHECKSUMS_USE_IMPORT_EXPORT -DAWS_COMMON_USE_IMPORT_EXPORT -DAWS_EVENT_STREAM_USE_IMPORT_EXPORT -DAWS_SDK_VERSION_MAJOR=1 -DAWS_SDK_VERSION_MINOR=8 -DAWS_SDK_VERSION_PATCH=83 -DAWS_TRANSFER_EXPORTS -DENABLE_BCRYPT_ENCRYPTION -DENABLE_WINDOWS_CLIENT -DPLATFORM_WINDOWS -DUSE_IMPORT_EXPORT=1 -DUSE_WINDOWS_DLL_SEMANTICS -Daws_cpp_sdk_transfer_EXPORTS -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\include -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-s3\include -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-core\include -IG:\15725\vcpkg\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W4 /utf-8 /GR /EHsc /MP  /MP /bigobj /WX /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Foaws-cpp-sdk-transfer\CMakeFiles\aws-cpp-sdk-transfer.dir\source\transfer\TransferManager.cpp.obj /Fdaws-cpp-sdk-transfer\CMakeFiles\aws-cpp-sdk-transfer.dir\ /FS -c G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp
FAILED: aws-cpp-sdk-transfer/CMakeFiles/aws-cpp-sdk-transfer.dir/source/transfer/TransferManager.cpp.obj 
"C:\PROGRA~2\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x86\cl.exe"   /TP -DAWS_CHECKSUMS_USE_IMPORT_EXPORT -DAWS_COMMON_USE_IMPORT_EXPORT -DAWS_EVENT_STREAM_USE_IMPORT_EXPORT -DAWS_SDK_VERSION_MAJOR=1 -DAWS_SDK_VERSION_MINOR=8 -DAWS_SDK_VERSION_PATCH=83 -DAWS_TRANSFER_EXPORTS -DENABLE_BCRYPT_ENCRYPTION -DENABLE_WINDOWS_CLIENT -DPLATFORM_WINDOWS -DUSE_IMPORT_EXPORT=1 -DUSE_WINDOWS_DLL_SEMANTICS -Daws_cpp_sdk_transfer_EXPORTS -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\include -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-s3\include -IG:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-core\include -IG:\15725\vcpkg\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W4 /utf-8 /GR /EHsc /MP  /MP /bigobj /WX /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Foaws-cpp-sdk-transfer\CMakeFiles\aws-cpp-sdk-transfer.dir\source\transfer\TransferManager.cpp.obj /Fdaws-cpp-sdk-transfer\CMakeFiles\aws-cpp-sdk-transfer.dir\ /FS -c G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(772): error C2220: warning treated as error - no 'object' file generated
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(772): warning C4244: 'initializing': conversion from 'const _Ty' to 'size_t', possible loss of data
        with
        [
            _Ty=uint64_t
        ]
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(777): warning C4244: 'initializing': conversion from 'uint64_t' to 'size_t', possible loss of data
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(927): warning C4244: 'argument': conversion from 'uint64_t' to 'size_t', possible loss of data
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-core\include\aws/core/utils/memory/AWSMemory.h(66): warning C4244: 'argument': conversion from '_Ty' to 'size_t', possible loss of data
        with
        [
            _Ty=uint64_t
        ]
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-core\include\aws/core/utils/memory/AWSMemory.h(258): note: see reference to function template instantiation 'T *Aws::New<T,const _Ty&,unsigned __int64>(const char *,const _Ty &,unsigned __int64 &&)' being compiled
        with
        [
            T=Aws::Utils::Stream::PreallocatedStreamBuf,
            _Ty=unsigned char *
        ]
G:\15725\vcpkg\buildtrees\aws-sdk-cpp\src\1c85d0a8c9-4ee9b543a6.clean\aws-cpp-sdk-transfer\source\transfer\TransferManager.cpp(827): note: see reference to function template instantiation 'std::unique_ptr<Aws::Utils::Stream::PreallocatedStreamBuf,Aws::Deleter<Aws::Utils::Stream::PreallocatedStreamBuf>> Aws::MakeUnique<Aws::Utils::Stream::PreallocatedStreamBuf,const RESOURCE_TYPE&,uint64_t>(const char *,const RESOURCE_TYPE &,uint64_t &&)' being compiled
        with
        [
            RESOURCE_TYPE=unsigned char *
        ]

This is not related at all to my changes. The current VCPKG version has this bug: aws/aws-sdk-cpp#1512
My version makes changes to Android only. Do you want me to update to the latest AWS version?

ports/libssh/portfile.cmake

ports/curl/0009_fix_openssl_config.patch

…cpkg into fix_aws_sdk_android

…aws_sdk_android

…droid Fix zlib building for Android Remove redundant patch comments

…3' into fix_aws_sdk_android

…aws_sdk_android

JackBoosY

Can you please merge from master?

Thanks.

versions/o-/openssl.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

…cpkg into fix_aws_sdk_android

ahmedyarub · 2021-04-15T02:36:55Z

Can you please merge from master?

Thanks.

Done

JackBoosY · 2021-04-15T02:39:12Z

Ping @ras0219 @ras0219-msft for review again.

ahmedyarub · 2021-04-15T16:04:33Z

Something is really wrong with the pipelines. Here it says that the pipelines are still in progress but here https://dev.azure.com/vcpkg/public/_build/results?buildId=52107&view=results all the tests passed successfully hours ago!

strega-nil · 2021-04-15T20:47:53Z

@ahmedyarub it was an issue with the oauth token we think

ahmedalnuaimi added 2 commits January 18, 2021 04:07

Fix Android build

ee8fe0c

Add versioning support

5425e02

ahmedyarub mentioned this pull request Jan 18, 2021

Fix Android Build for AWS #15696

Closed

JackBoosY self-assigned this Jan 18, 2021

JackBoosY added category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist labels Jan 18, 2021

JackBoosY suggested changes Jan 18, 2021

View reviewed changes

ports/aws-sdk-cpp/allow-vcpkg-chaining.patch Outdated Show resolved Hide resolved

JackBoosY added the requires:author-response label Jan 18, 2021

Disable building tests for cURL

d0ca64e

ahmedalnuaimi added 2 commits January 18, 2021 22:25

Fix patch file

04664bf

Fix patch file

299bd52

ahmedalnuaimi added 2 commits January 18, 2021 23:06

Fix patch file

5fbee0e

Fix versioning

9e3bb21

JackBoosY removed the requires:author-response label Jan 19, 2021

JackBoosY suggested changes Jan 19, 2021

View reviewed changes

ports/aws-sdk-cpp/portfile.cmake Outdated Show resolved Hide resolved

JackBoosY added the requires:author-response label Jan 19, 2021

ahmedalnuaimi and others added 2 commits January 18, 2021 23:55

Fix patch file

7eace24

[aws-sdk-cpp] Update patch

188b641

JackBoosY removed the requires:author-response label Jan 19, 2021

update baseline

7da2a3d

JackBoosY approved these changes Jan 19, 2021

View reviewed changes

JackBoosY added the requires:author-response label Jan 19, 2021

strega-nil reviewed Apr 13, 2021

View reviewed changes

ports/libssh/portfile.cmake Outdated Show resolved Hide resolved

Update ports/libssh/portfile.cmake

d9f1f26

strega-nil approved these changes Apr 13, 2021

View reviewed changes

ports/curl/0009_fix_openssl_config.patch Outdated Show resolved Hide resolved

ports/curl/0009_fix_openssl_config.patch Outdated Show resolved Hide resolved

ports/curl/0009_fix_openssl_config.patch Outdated Show resolved Hide resolved

Apply suggestions from code review

d1b0d34

strega-nil reviewed Apr 13, 2021

View reviewed changes

ports/curl/0009_fix_openssl_config.patch Show resolved Hide resolved

ahmedalnuaimi added 3 commits April 13, 2021 22:00

Merge branch 'fix_aws_sdk_android' of https://github.com/ahmedyarub/v…

dc088a4

…cpkg into fix_aws_sdk_android

Merge branch 'master' of https://github.com/Microsoft/vcpkg into fix_…

a658b2d

…aws_sdk_android

Use correct variables for OpenSSL libraries when building curl for An…

9df34f1

…droid Fix zlib building for Android Remove redundant patch comments

ahmedyarub changed the title ~~Fix OpenSSL, curl and AWS SDK for Android~~ Fix zlib, OpenSSL, curl and AWS SDK for Android Apr 14, 2021

ahmedalnuaimi and others added 6 commits April 13, 2021 22:47

Bump zlib's port version

75de9a9

Update zlib, libssh, and curl versions

b331242

[vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path

1d90b57

update version record

92523c0

Merge remote-tracking branch 'JackBoosY/dev/jack/fix-baseline-2020041…

f50e467

…3' into fix_aws_sdk_android

Merge branch 'master' of https://github.com/Microsoft/vcpkg into fix_…

1170050

…aws_sdk_android

JackBoosY suggested changes Apr 15, 2021

View reviewed changes

versions/o-/openssl.json Outdated Show resolved Hide resolved

JackBoosY removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Apr 15, 2021

Ahmed Yarub Hani Al Nuaimi and others added 2 commits April 14, 2021 23:30

Update versions/o-/openssl.json

c9554a2

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

Merge branch 'fix_aws_sdk_android' of https://github.com/ahmedyarub/v…

5795463

…cpkg into fix_aws_sdk_android

ahmedyarub requested a review from JackBoosY April 15, 2021 02:37

JackBoosY approved these changes Apr 15, 2021

View reviewed changes

JackBoosY added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Apr 15, 2021

ahmedyarub changed the title ~~Fix zlib, OpenSSL, curl and AWS SDK for Android~~ [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android Apr 19, 2021

strega-nil merged commit fe25e8e into microsoft:master Apr 20, 2021

ahmedyarub deleted the fix_aws_sdk_android branch April 22, 2021 12:32

Conversation

ahmedyarub commented Jan 18, 2021

Uh oh!

Uh oh!

ahmedyarub commented Jan 18, 2021

Uh oh!

JackBoosY commented Jan 19, 2021

Uh oh!

ahmedyarub commented Jan 19, 2021

Uh oh!

Uh oh!

JackBoosY commented Jan 19, 2021

Uh oh!

ahmedyarub commented Jan 19, 2021

Uh oh!

JackBoosY commented Jan 19, 2021

Uh oh!

JackBoosY commented Jan 19, 2021

Uh oh!

ahmedyarub commented Jan 19, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JackBoosY left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ahmedyarub commented Apr 15, 2021

Uh oh!

JackBoosY commented Apr 15, 2021

Uh oh!

ahmedyarub commented Apr 15, 2021

Uh oh!

strega-nil commented Apr 15, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants