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/zlib | |
| 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/zlib')
| -rw-r--r-- | ports/zlib/0002-android-build-mingw.patch | 21 | ||||
| -rw-r--r-- | ports/zlib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zlib/portfile.cmake | 1 |
3 files changed, 23 insertions, 1 deletions
diff --git a/ports/zlib/0002-android-build-mingw.patch b/ports/zlib/0002-android-build-mingw.patch new file mode 100644 index 000000000..188499df0 --- /dev/null +++ b/ports/zlib/0002-android-build-mingw.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (date 1618364429263) ++++ b/CMakeLists.txt (date 1618364429263) +@@ -170,7 +170,7 @@ + string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" + "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) + +-if(MINGW) ++if(MINGW AND NOT ANDROID) + # This gets us DLL resource information when compiling on MinGW. + if(NOT CMAKE_RC_COMPILER) + set(CMAKE_RC_COMPILER windres.exe) +@@ -186,7 +186,7 @@ + if(BUILD_SHARED_LIBS) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) + endif() +-endif(MINGW) ++endif(MINGW AND NOT ANDROID) + + add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL index 9a79b2e7b..a4c1a55d6 100644 --- a/ports/zlib/CONTROL +++ b/ports/zlib/CONTROL @@ -1,5 +1,5 @@ Source: zlib Version: 1.2.11 -Port-Version: 9 +Port-Version: 10 Homepage: https://www.zlib.net/ Description: A compression library diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 0d63291a2..429d85440 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( "cmake_dont_build_more_than_needed.patch" "0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch" "add_debug_postfix_on_mingw.patch" + "0002-android-build-mingw.patch" ) # This is generated during the cmake build |