From ee8fe0c8279351db91e82c9b1639914db6acc918 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 04:07:16 -0300 Subject: [PATCH 01/68] Fix Android build --- ports/aws-sdk-cpp/CONTROL | 4 +- ports/aws-sdk-cpp/allow-vcpkg-chaining.patch | 91 ++++++++++++++++++++ ports/aws-sdk-cpp/portfile.cmake | 11 +++ 3 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 ports/aws-sdk-cpp/allow-vcpkg-chaining.patch diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 1b46d7d3664fb3..3a3b4b85652b4a 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,9 +1,9 @@ Source: aws-sdk-cpp Version: 1.8.83 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ -Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream, zlib +Build-Depends: openssl (!uwp&!windows&!android), curl (!uwp&!windows&!android), aws-c-event-stream(!android), zlib(!android) Default-Features: dynamodb, s3, kinesis # Automatically generated by generateFeatures.ps1 diff --git a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch new file mode 100644 index 00000000000000..3027fe0c7f915d --- /dev/null +++ b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch @@ -0,0 +1,91 @@ +diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake +--- a/cmake/build_external.cmake (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) ++++ b/cmake/build_external.cmake (date 1610744839203) +@@ -23,6 +23,11 @@ + #zlib + #based on http://stackoverflow.com/questions/16842218/how-to-use-cmake-externalproject-add-or-alternatives-in-a-cross-platform-way + #likely, some of the things here are unnecessary ++ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) ++ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") ++ endif() ++ + ExternalProject_Add(ZLIB + SOURCE_DIR ${ZLIB_SOURCE_DIR} + URL https://sdk.amazonaws.com/cpp/builds/zlib-1.2.11.tar.gz +@@ -31,6 +36,7 @@ + CMAKE_ARGS + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} ++ ${EXTRA_ARGS} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} + -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} +@@ -70,6 +76,11 @@ + set(OPENSSL_INCLUDE_FLAGS "-isystem ${OPENSSL_INCLUDE_DIR} -isystem ${OPENSSL_INCLUDE_DIR}/openssl" CACHE INTERNAL "compiler flags to find openssl includes") + set(OPENSSL_LINKER_FLAGS "-L${OPENSSL_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find openssl") + ++ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) ++ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") ++ endif() ++ + ExternalProject_Add(OPENSSL + SOURCE_DIR ${OPENSSL_SOURCE_DIR} + GIT_REPOSITORY https://github.com/openssl/openssl.git +@@ -78,6 +89,7 @@ + PATCH_COMMAND cd ${CMAKE_BINARY_DIR} && python ${AWS_NATIVE_SDK_ROOT}/android-build/configure_openssl_cmake.py --source ${AWS_NATIVE_SDK_ROOT} --dest ${OPENSSL_SOURCE_DIR} + CMAKE_ARGS + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ++ ${EXTRA_ARGS} + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} +@@ -120,6 +132,11 @@ + set(CURL_USE_ZLIB "OFF") + endif() + ++ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) ++ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") ++ endif() ++ + ExternalProject_Add(CURL + DEPENDS ${CURL_OPENSSL_DEPENDENCY} ${CURL_ZLIB_DEPENDENCY} + SOURCE_DIR ${CURL_SOURCE_DIR} +@@ -130,6 +147,7 @@ + CMAKE_ARGS + -C ${AWS_NATIVE_SDK_ROOT}/android-build/CurlAndroidCrossCompile.cmake + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ++ ${EXTRA_ARGS} + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} +@@ -146,7 +164,6 @@ + -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} + -DCURL_STATICLIB=ON + -DBUILD_CURL_EXE=ON +- -DBUILD_CURL_TESTS=OFF + -DCURL_ZLIB=${CURL_USE_ZLIB} + ) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) ++++ b/CMakeLists.txt (date 1610744839158) +@@ -163,10 +163,16 @@ + endif() + file(MAKE_DIRECTORY ${AWS_DEPS_BUILD_DIR}) + if(TARGET_ARCH STREQUAL "ANDROID") ++ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) ++ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") ++ endif() ++ + execute_process( + COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} + -DTARGET_ARCH=${TARGET_ARCH} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ++ ${EXTRA_ARGS} + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 26f7bb8afb4f6a..bd08f76ea5b62a 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES patch-relocatable-rpath.patch fix-AWSSDKCONFIG.patch + allow-vcpkg-chaining.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) @@ -19,6 +20,15 @@ include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(rpath "@loader_path") +elseif (VCPKG_TARGET_IS_ANDROID) + find_package(Git) + + set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" + "-DGIT_EXECUTABLE=${GIT_EXECUTABLE}" + "-DGIT_FOUND=${GIT_FOUND}" + "-DGIT_VERSION_STRING=${GIT_VERSION_STRING}" + "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" + ) else() set(rpath "\$ORIGIN") endif() @@ -27,6 +37,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} From 5425e02aa7d0054f6eb89a2000bc246600abb8c5 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 04:09:01 -0300 Subject: [PATCH 02/68] Add versioning support --- port_versions/a-/aws-sdk-cpp.json | 5 +++++ port_versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/port_versions/a-/aws-sdk-cpp.json b/port_versions/a-/aws-sdk-cpp.json index a8ac33f4b97fea..c99e332997e6c4 100644 --- a/port_versions/a-/aws-sdk-cpp.json +++ b/port_versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aceca36db393df3bdaf8a8a1dd17ad2b5feae436", + "version-string": "1.8.83", + "port-version": 5 + }, { "git-tree": "1474856fe6fdeb8feab5068959e189bc9f6c0327", "version-string": "1.8.83", diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 250f6157cf862c..7d0292db2cbc23 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -234,7 +234,7 @@ }, "aws-sdk-cpp": { "baseline": "1.8.83", - "port-version": 4 + "port-version": 5 }, "azmq": { "baseline": "2020-03-03", From d0ca64ea42f87b9c1b5b787755f33418f662f37d Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 05:49:34 -0300 Subject: [PATCH 03/68] Disable building tests for cURL --- ports/aws-sdk-cpp/allow-vcpkg-chaining.patch | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch index 3027fe0c7f915d..002f821e9219c2 100644 --- a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch +++ b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch @@ -65,7 +65,6 @@ diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -DCURL_STATICLIB=ON -DBUILD_CURL_EXE=ON -- -DBUILD_CURL_TESTS=OFF -DCURL_ZLIB=${CURL_USE_ZLIB} ) From 04664bfeef2c445b01d0c0075efda58bd2e51bfc Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 22:25:30 -0300 Subject: [PATCH 04/68] Fix patch file --- ports/aws-sdk-cpp/allow-vcpkg-chaining.patch | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch index 002f821e9219c2..9477cb68667617 100644 --- a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch +++ b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch @@ -67,7 +67,6 @@ diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake -DBUILD_CURL_EXE=ON -DCURL_ZLIB=${CURL_USE_ZLIB} ) - diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) +++ b/CMakeLists.txt (date 1610744839158) From 299bd528d5c62e6aa6746ea9286b7fe19404b436 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 22:46:21 -0300 Subject: [PATCH 05/68] Fix patch file --- ports/aws-sdk-cpp/allow-vcpkg-chaining.patch | 109 ++++-------------- .../build-external-allow-vcpkg-chaining.patch | 69 +++++++++++ ports/aws-sdk-cpp/portfile.cmake | 1 + 3 files changed, 90 insertions(+), 89 deletions(-) create mode 100644 ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch diff --git a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch index 9477cb68667617..8ca3d8a4a07cf5 100644 --- a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch +++ b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch @@ -1,89 +1,20 @@ -diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake ---- a/cmake/build_external.cmake (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) -+++ b/cmake/build_external.cmake (date 1610744839203) -@@ -23,6 +23,11 @@ - #zlib - #based on http://stackoverflow.com/questions/16842218/how-to-use-cmake-externalproject-add-or-alternatives-in-a-cross-platform-way - #likely, some of the things here are unnecessary -+ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) -+ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") -+ endif() -+ - ExternalProject_Add(ZLIB - SOURCE_DIR ${ZLIB_SOURCE_DIR} - URL https://sdk.amazonaws.com/cpp/builds/zlib-1.2.11.tar.gz -@@ -31,6 +36,7 @@ - CMAKE_ARGS - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} -+ ${EXTRA_ARGS} - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DANDROID_ABI=${ANDROID_ABI} - -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} -@@ -70,6 +76,11 @@ - set(OPENSSL_INCLUDE_FLAGS "-isystem ${OPENSSL_INCLUDE_DIR} -isystem ${OPENSSL_INCLUDE_DIR}/openssl" CACHE INTERNAL "compiler flags to find openssl includes") - set(OPENSSL_LINKER_FLAGS "-L${OPENSSL_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find openssl") - -+ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) -+ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") -+ endif() -+ - ExternalProject_Add(OPENSSL - SOURCE_DIR ${OPENSSL_SOURCE_DIR} - GIT_REPOSITORY https://github.com/openssl/openssl.git -@@ -78,6 +89,7 @@ - PATCH_COMMAND cd ${CMAKE_BINARY_DIR} && python ${AWS_NATIVE_SDK_ROOT}/android-build/configure_openssl_cmake.py --source ${AWS_NATIVE_SDK_ROOT} --dest ${OPENSSL_SOURCE_DIR} - CMAKE_ARGS - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -+ ${EXTRA_ARGS} - -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DANDROID_ABI=${ANDROID_ABI} -@@ -120,6 +132,11 @@ - set(CURL_USE_ZLIB "OFF") - endif() - -+ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) -+ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") -+ endif() -+ - ExternalProject_Add(CURL - DEPENDS ${CURL_OPENSSL_DEPENDENCY} ${CURL_ZLIB_DEPENDENCY} - SOURCE_DIR ${CURL_SOURCE_DIR} -@@ -130,6 +147,7 @@ - CMAKE_ARGS - -C ${AWS_NATIVE_SDK_ROOT}/android-build/CurlAndroidCrossCompile.cmake - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -+ ${EXTRA_ARGS} - -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DANDROID_ABI=${ANDROID_ABI} -@@ -146,7 +164,6 @@ - -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} - -DCURL_STATICLIB=ON - -DBUILD_CURL_EXE=ON - -DCURL_ZLIB=${CURL_USE_ZLIB} - ) -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) -+++ b/CMakeLists.txt (date 1610744839158) -@@ -163,10 +163,16 @@ - endif() - file(MAKE_DIRECTORY ${AWS_DEPS_BUILD_DIR}) - if(TARGET_ARCH STREQUAL "ANDROID") -+ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) -+ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") -+ endif() -+ - execute_process( - COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} - -DTARGET_ARCH=${TARGET_ARCH} - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -+ ${EXTRA_ARGS} - -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DANDROID_ABI=${ANDROID_ABI} +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) ++++ b/CMakeLists.txt (date 1610744839158) +@@ -163,10 +163,16 @@ + endif() + file(MAKE_DIRECTORY ${AWS_DEPS_BUILD_DIR}) + if(TARGET_ARCH STREQUAL "ANDROID") ++ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) ++ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") ++ endif() ++ + execute_process( + COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} + -DTARGET_ARCH=${TARGET_ARCH} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ++ ${EXTRA_ARGS} + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} diff --git a/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch new file mode 100644 index 00000000000000..3e2a61dec6445f --- /dev/null +++ b/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch @@ -0,0 +1,69 @@ +diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake +--- a/cmake/build_external.cmake (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) ++++ b/cmake/build_external.cmake (date 1610744839203) +@@ -23,6 +23,11 @@ + #zlib + #based on http://stackoverflow.com/questions/16842218/how-to-use-cmake-externalproject-add-or-alternatives-in-a-cross-platform-way + #likely, some of the things here are unnecessary ++ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) ++ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") ++ endif() ++ + ExternalProject_Add(ZLIB + SOURCE_DIR ${ZLIB_SOURCE_DIR} + URL https://sdk.amazonaws.com/cpp/builds/zlib-1.2.11.tar.gz +@@ -31,6 +36,7 @@ + CMAKE_ARGS + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} ++ ${EXTRA_ARGS} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} + -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} +@@ -70,6 +76,11 @@ + set(OPENSSL_INCLUDE_FLAGS "-isystem ${OPENSSL_INCLUDE_DIR} -isystem ${OPENSSL_INCLUDE_DIR}/openssl" CACHE INTERNAL "compiler flags to find openssl includes") + set(OPENSSL_LINKER_FLAGS "-L${OPENSSL_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find openssl") + ++ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) ++ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") ++ endif() ++ + ExternalProject_Add(OPENSSL + SOURCE_DIR ${OPENSSL_SOURCE_DIR} + GIT_REPOSITORY https://github.com/openssl/openssl.git +@@ -78,6 +89,7 @@ + PATCH_COMMAND cd ${CMAKE_BINARY_DIR} && python ${AWS_NATIVE_SDK_ROOT}/android-build/configure_openssl_cmake.py --source ${AWS_NATIVE_SDK_ROOT} --dest ${OPENSSL_SOURCE_DIR} + CMAKE_ARGS + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ++ ${EXTRA_ARGS} + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} +@@ -120,6 +132,11 @@ + set(CURL_USE_ZLIB "OFF") + endif() + ++ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) ++ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") ++ endif() ++ + ExternalProject_Add(CURL + DEPENDS ${CURL_OPENSSL_DEPENDENCY} ${CURL_ZLIB_DEPENDENCY} + SOURCE_DIR ${CURL_SOURCE_DIR} +@@ -130,6 +147,7 @@ + CMAKE_ARGS + -C ${AWS_NATIVE_SDK_ROOT}/android-build/CurlAndroidCrossCompile.cmake + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ++ ${EXTRA_ARGS} + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} +@@ -146,7 +164,6 @@ + -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} + -DCURL_STATICLIB=ON + -DBUILD_CURL_EXE=ON + -DCURL_ZLIB=${CURL_USE_ZLIB} + ) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index bd08f76ea5b62a..3919152967a657 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES patch-relocatable-rpath.patch fix-AWSSDKCONFIG.patch + build-external-allow-vcpkg-chaining.patch allow-vcpkg-chaining.patch ) From 5fbee0ec655ace1fae3dc179c51597029ee5784e Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 23:06:40 -0300 Subject: [PATCH 06/68] Fix patch file --- ports/aws-sdk-cpp/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 3919152967a657..d92079de25ecfc 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( PATCHES patch-relocatable-rpath.patch fix-AWSSDKCONFIG.patch - build-external-allow-vcpkg-chaining.patch + #build-external-allow-vcpkg-chaining.patch allow-vcpkg-chaining.patch ) From 9e3bb215897c72320dff08bf65df266358281fcc Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 23:19:26 -0300 Subject: [PATCH 07/68] Fix versioning --- port_versions/a-/aws-sdk-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/a-/aws-sdk-cpp.json b/port_versions/a-/aws-sdk-cpp.json index c99e332997e6c4..4e54a7a1d5bd68 100644 --- a/port_versions/a-/aws-sdk-cpp.json +++ b/port_versions/a-/aws-sdk-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "aceca36db393df3bdaf8a8a1dd17ad2b5feae436", + "git-tree": "dfcc80c9247782ddae711f014f3ce057d879af25", "version-string": "1.8.83", "port-version": 5 }, From 7eace24bff8d65b2c60beb5a61fcef4ff26f2691 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 23:55:04 -0300 Subject: [PATCH 08/68] Fix patch file --- ports/aws-sdk-cpp/allow-vcpkg-chaining.patch | 7 ++++--- ports/aws-sdk-cpp/portfile.cmake | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch index 8ca3d8a4a07cf5..1d3f7fb1cd587a 100644 --- a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch +++ b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch @@ -1,7 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) -+++ b/CMakeLists.txt (date 1610744839158) -@@ -163,10 +163,16 @@ ++++ b/CMakeLists.txt (date 1611024813458) +@@ -163,11 +163,17 @@ endif() file(MAKE_DIRECTORY ${AWS_DEPS_BUILD_DIR}) if(TARGET_ARCH STREQUAL "ANDROID") @@ -14,7 +14,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTARGET_ARCH=${TARGET_ARCH} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -+ ${EXTRA_ARGS} -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} ++ ${EXTRA_ARGS} -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} -DANDROID_ABI=${ANDROID_ABI} + -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index d92079de25ecfc..3919152967a657 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( PATCHES patch-relocatable-rpath.patch fix-AWSSDKCONFIG.patch - #build-external-allow-vcpkg-chaining.patch + build-external-allow-vcpkg-chaining.patch allow-vcpkg-chaining.patch ) From 188b641d53559edc0483d7161a5b59fa387c077d Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Jan 2021 19:11:06 -0800 Subject: [PATCH 09/68] [aws-sdk-cpp] Update patch --- .../build-external-allow-vcpkg-chaining.patch | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch index 3e2a61dec6445f..495efcc0eec45a 100644 --- a/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch +++ b/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch @@ -1,7 +1,8 @@ diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake ---- a/cmake/build_external.cmake (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) -+++ b/cmake/build_external.cmake (date 1610744839203) -@@ -23,6 +23,11 @@ +index b420119..07868bb 100644 +--- a/cmake/build_external.cmake ++++ b/cmake/build_external.cmake +@@ -23,6 +23,11 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) #zlib #based on http://stackoverflow.com/questions/16842218/how-to-use-cmake-externalproject-add-or-alternatives-in-a-cross-platform-way #likely, some of the things here are unnecessary @@ -13,7 +14,7 @@ diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake ExternalProject_Add(ZLIB SOURCE_DIR ${ZLIB_SOURCE_DIR} URL https://sdk.amazonaws.com/cpp/builds/zlib-1.2.11.tar.gz -@@ -31,6 +36,7 @@ +@@ -31,6 +36,7 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} @@ -21,30 +22,30 @@ diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} -@@ -70,6 +76,11 @@ +@@ -69,6 +75,11 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) + set(OPENSSL_INCLUDE_FLAGS "-isystem ${OPENSSL_INCLUDE_DIR} -isystem ${OPENSSL_INCLUDE_DIR}/openssl" CACHE INTERNAL "compiler flags to find openssl includes") set(OPENSSL_LINKER_FLAGS "-L${OPENSSL_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find openssl") - ++ + if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" + "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") + endif() -+ + ExternalProject_Add(OPENSSL SOURCE_DIR ${OPENSSL_SOURCE_DIR} - GIT_REPOSITORY https://github.com/openssl/openssl.git -@@ -78,6 +89,7 @@ - PATCH_COMMAND cd ${CMAKE_BINARY_DIR} && python ${AWS_NATIVE_SDK_ROOT}/android-build/configure_openssl_cmake.py --source ${AWS_NATIVE_SDK_ROOT} --dest ${OPENSSL_SOURCE_DIR} - CMAKE_ARGS - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -+ ${EXTRA_ARGS} - -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} +@@ -82,6 +93,7 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} -DANDROID_ABI=${ANDROID_ABI} -@@ -120,6 +132,11 @@ + -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} ++ ${EXTRA_ARGS} + -DANDROID_STL=${ANDROID_STL} + -DCMAKE_INSTALL_PREFIX=${OPENSSL_INSTALL_DIR} + -DCMAKE_CXX_FLAGS=${OPENSSL_CXX_FLAGS} +@@ -120,6 +132,11 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) set(CURL_USE_ZLIB "OFF") endif() - + + if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" + "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") @@ -53,7 +54,7 @@ diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake ExternalProject_Add(CURL DEPENDS ${CURL_OPENSSL_DEPENDENCY} ${CURL_ZLIB_DEPENDENCY} SOURCE_DIR ${CURL_SOURCE_DIR} -@@ -130,6 +147,7 @@ +@@ -130,6 +147,7 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) CMAKE_ARGS -C ${AWS_NATIVE_SDK_ROOT}/android-build/CurlAndroidCrossCompile.cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} @@ -61,9 +62,3 @@ diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} -DANDROID_ABI=${ANDROID_ABI} -@@ -146,7 +164,6 @@ - -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} - -DCURL_STATICLIB=ON - -DBUILD_CURL_EXE=ON - -DCURL_ZLIB=${CURL_USE_ZLIB} - ) From 7da2a3dfbcb0642eb8d228c47e0dcfe741a2f313 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Jan 2021 19:14:08 -0800 Subject: [PATCH 10/68] update baseline --- port_versions/a-/aws-sdk-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/a-/aws-sdk-cpp.json b/port_versions/a-/aws-sdk-cpp.json index 4e54a7a1d5bd68..b4c21673c18c75 100644 --- a/port_versions/a-/aws-sdk-cpp.json +++ b/port_versions/a-/aws-sdk-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dfcc80c9247782ddae711f014f3ce057d879af25", + "git-tree": "cd8791f5292e81e5fbea26d2702513146c8ef476", "version-string": "1.8.83", "port-version": 5 }, From bf92d4b0b5bb7ad502874289166da9fda93aafad Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 16:54:06 -0300 Subject: [PATCH 11/68] Fix dependencies --- ports/aws-sdk-cpp/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 3a3b4b85652b4a..0392372986fdf0 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -3,7 +3,7 @@ Version: 1.8.83 Port-Version: 5 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ -Build-Depends: openssl (!uwp&!windows&!android), curl (!uwp&!windows&!android), aws-c-event-stream(!android), zlib(!android) +Build-Depends: openssl (!uwp&!windows&!android), curl (!uwp&!windows&!android), aws-c-event-stream, zlib(!android) Default-Features: dynamodb, s3, kinesis # Automatically generated by generateFeatures.ps1 From a36d031e20002c4e027f32915663f8d23594789b Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 23:22:18 -0300 Subject: [PATCH 12/68] Simplify Android configuration --- ports/aws-sdk-cpp/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 691f7a554ef5f0..19c0b606a14796 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -28,7 +28,6 @@ elseif (VCPKG_TARGET_IS_ANDROID) "-DGIT_EXECUTABLE=${GIT_EXECUTABLE}" "-DGIT_FOUND=${GIT_FOUND}" "-DGIT_VERSION_STRING=${GIT_VERSION_STRING}" - "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ) else() set(rpath "\$ORIGIN") From 3b9e29834992eed749182ee9518d1a2f299a6476 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 23:22:45 -0300 Subject: [PATCH 13/68] Simplify Android configuration --- port_versions/a-/aws-sdk-cpp.json | 5 +++++ port_versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/port_versions/a-/aws-sdk-cpp.json b/port_versions/a-/aws-sdk-cpp.json index 91b3621492fc57..7fdedcdd14a25b 100644 --- a/port_versions/a-/aws-sdk-cpp.json +++ b/port_versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d12259b9a98bb3bc8f5df4c5d2417f899e9a6623", + "version-string": "1.8.126", + "port-version": 6 + }, { "git-tree": "1091bd9bd625aab8f19bc9d32499bd888788c613", "version-string": "1.8.126", diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 511f9541ab4500..c51280436bc24d 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -234,7 +234,7 @@ }, "aws-sdk-cpp": { "baseline": "1.8.126", - "port-version": 5 + "port-version": 6 }, "azmq": { "baseline": "2020-03-03", From 83e3b38767e62ce0d7331501fa1c653695703928 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Wed, 20 Jan 2021 23:01:09 -0300 Subject: [PATCH 14/68] Simplify Android configuration Add alternative Git CMake script --- ports/aws-sdk-cpp/FindGit.cmake | 181 ++++++++++++++++++ ports/aws-sdk-cpp/allow-vcpkg-chaining.patch | 21 -- .../build-external-allow-vcpkg-chaining.patch | 64 ------- ports/aws-sdk-cpp/portfile.cmake | 7 +- 4 files changed, 186 insertions(+), 87 deletions(-) create mode 100644 ports/aws-sdk-cpp/FindGit.cmake delete mode 100644 ports/aws-sdk-cpp/allow-vcpkg-chaining.patch delete mode 100644 ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch diff --git a/ports/aws-sdk-cpp/FindGit.cmake b/ports/aws-sdk-cpp/FindGit.cmake new file mode 100644 index 00000000000000..a1d8f2fb5b2a5f --- /dev/null +++ b/ports/aws-sdk-cpp/FindGit.cmake @@ -0,0 +1,181 @@ +################################################################################ +# +# Program: 3D Slicer +# +# Copyright (c) Kitware Inc. +# +# See COPYRIGHT.txt +# or http://www.slicer.org/copyright/copyright.txt for details. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file was originally developed by Jean-Christophe Fillion-Robin, Kitware Inc. +# and was partially funded by NIH grant 3P41RR013218-12S1 +# +################################################################################ + +# +# The module defines the following variables: +# GIT_EXECUTABLE - path to git command line client +# GIT_FOUND - true if the command line client was found +# GIT_VERSION_STRING - the version of git found (since CMake 2.8.8) +# +# If the command line client executable is found the macro +# GIT_WC_INFO( ) +# is defined to extract information of a git working copy at +# a given location. +# +# The macro defines the following variables: +# _WC_REVISION_HASH - Current SHA1 hash +# _WC_REVISION - Current SHA1 hash +# _WC_REVISION_NAME - Name associated with _WC_REVISION_HASH +# _WC_URL - output of command `git config --get remote.origin.url' +# _WC_ROOT - Same value as working copy URL +# _WC_LAST_CHANGED_DATE - date of last commit +# _WC_GITSVN - Set to false +# +# ... and also the following ones if it's a git-svn repository: +# _WC_GITSVN - Set to True if it is a +# _WC_INFO - output of command `git svn info' +# _WC_URL - url of the associated SVN repository +# _WC_ROOT - root url of the associated SVN repository +# _WC_REVISION - current SVN revision number +# _WC_LAST_CHANGED_AUTHOR - author of last commit +# _WC_LAST_CHANGED_DATE - date of last commit +# _WC_LAST_CHANGED_REV - revision of last commit +# _WC_LAST_CHANGED_LOG - last log of base revision +# _WC_COMMIT_COUNT - number of commits in current branch +# +# Example usage: +# find_package(Git) +# if(GIT_FOUND) +# GIT_WC_INFO(${PROJECT_SOURCE_DIR} Project) +# message("Current revision is ${Project_WC_REVISION_HASH}") +# message("git found: ${GIT_EXECUTABLE}") +# endif() +# + +# Look for 'git' or 'eg' (easy git) +# +set(git_names git eg) + +# Prefer .cmd variants on Windows unless running in a Makefile +# in the MSYS shell. +# +if(WIN32) + if(NOT CMAKE_GENERATOR MATCHES "MSYS") + # Note: Due to a bug in 'git.cmd' preventing it from returning the exit code of 'git', + # we excluded it from the list of executables to search. + # See http://code.google.com/p/msysgit/issues/detail?id=428 + # TODO Check if 'git' exists, get the associated version, if the corresponding version + # is known to have a working version of 'git.cmd', use it. + set(git_names git eg.cmd eg) + endif() +endif() + +find_program(GIT_EXECUTABLE ${git_names} + PATHS + "C:/Program Files/Git/bin" + "C:/Program Files (x86)/Git/bin" + DOC "git command line client") +mark_as_advanced(GIT_EXECUTABLE) + +if(GIT_EXECUTABLE) + execute_process(COMMAND ${GIT_EXECUTABLE} --version + OUTPUT_VARIABLE git_version + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + if (git_version MATCHES "^git version [0-9]") + string(REPLACE "git version " "" GIT_VERSION_STRING "${git_version}") + endif() + unset(git_version) + + macro(GIT_WC_INFO dir prefix) + execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=7 HEAD + WORKING_DIRECTORY ${dir} + ERROR_VARIABLE GIT_error + OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(${prefix}_WC_REVISION ${${prefix}_WC_REVISION_HASH}) + if(NOT ${GIT_error} EQUAL 0) + message(SEND_ERROR "Command \"${GIT_EXECUTBALE} rev-parse --verify -q --short=7 HEAD\" in directory ${dir} failed with output:\n${GIT_error}") + else() + execute_process(COMMAND ${GIT_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH} + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${prefix}_WC_REVISION_NAME + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() + + execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${prefix}_WC_URL + OUTPUT_STRIP_TRAILING_WHITESPACE) + + execute_process(COMMAND ${GIT_EXECUTABLE} show -s --format=%ci ${${prefix}_WC_REVISION_HASH} + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${prefix}_show_output + OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REGEX REPLACE "^([0-9][0-9][0-9][0-9]\\-[0-9][0-9]\\-[0-9][0-9]).*" + "\\1" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_show_output}") + + execute_process(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${prefix}_WC_COMMIT_COUNT + OUTPUT_STRIP_TRAILING_WHITESPACE) + + set(${prefix}_WC_GITSVN False) + + # Check if this git is likely to be a git-svn repository + execute_process(COMMAND ${GIT_EXECUTABLE} config --get-regexp "^svn-remote" + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE git_config_output + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + if(NOT "${git_config_output}" STREQUAL "") + # In case git-svn is used, attempt to extract svn info + execute_process(COMMAND ${GIT_EXECUTABLE} svn info + WORKING_DIRECTORY ${dir} + TIMEOUT 3 + ERROR_VARIABLE git_svn_info_error + OUTPUT_VARIABLE ${prefix}_WC_INFO + RESULT_VARIABLE git_svn_info_result + OUTPUT_STRIP_TRAILING_WHITESPACE) + + if(${git_svn_info_result} EQUAL 0) + set(${prefix}_WC_GITSVN True) + string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*" + "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}") + string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*" + "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}") + string(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*" + "\\2" ${prefix}_WC_ROOT "${${prefix}_WC_INFO}") + string(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*" + "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}") + string(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*" + "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}") + string(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*" + "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}") + endif() + endif() + + # If there is no 'remote.origin', default to "NA" value and print a warning message. + if(NOT ${prefix}_WC_URL) + message(WARNING "No remote origin set for git repository: ${dir}" ) + set( ${prefix}_WC_URL "NA" ) + else() + set(${prefix}_WC_ROOT ${${prefix}_WC_URL}) + endif() + + endmacro() +endif() + +# Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if +# all listed variables are TRUE + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Git DEFAULT_MSG GIT_EXECUTABLE) \ No newline at end of file diff --git a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch deleted file mode 100644 index 1d3f7fb1cd587a..00000000000000 --- a/ports/aws-sdk-cpp/allow-vcpkg-chaining.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision e98e5732ec7319051f162f7314ae361c85d0a8c9) -+++ b/CMakeLists.txt (date 1611024813458) -@@ -163,11 +163,17 @@ - endif() - file(MAKE_DIRECTORY ${AWS_DEPS_BUILD_DIR}) - if(TARGET_ARCH STREQUAL "ANDROID") -+ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) -+ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") -+ endif() -+ - execute_process( - COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} - -DTARGET_ARCH=${TARGET_ARCH} - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} -+ ${EXTRA_ARGS} - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DANDROID_ABI=${ANDROID_ABI} - -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} diff --git a/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch b/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch deleted file mode 100644 index 495efcc0eec45a..00000000000000 --- a/ports/aws-sdk-cpp/build-external-allow-vcpkg-chaining.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake -index b420119..07868bb 100644 ---- a/cmake/build_external.cmake -+++ b/cmake/build_external.cmake -@@ -23,6 +23,11 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) - #zlib - #based on http://stackoverflow.com/questions/16842218/how-to-use-cmake-externalproject-add-or-alternatives-in-a-cross-platform-way - #likely, some of the things here are unnecessary -+ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) -+ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") -+ endif() -+ - ExternalProject_Add(ZLIB - SOURCE_DIR ${ZLIB_SOURCE_DIR} - URL https://sdk.amazonaws.com/cpp/builds/zlib-1.2.11.tar.gz -@@ -31,6 +36,7 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) - CMAKE_ARGS - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} -+ ${EXTRA_ARGS} - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DANDROID_ABI=${ANDROID_ABI} - -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} -@@ -69,6 +75,11 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) - - set(OPENSSL_INCLUDE_FLAGS "-isystem ${OPENSSL_INCLUDE_DIR} -isystem ${OPENSSL_INCLUDE_DIR}/openssl" CACHE INTERNAL "compiler flags to find openssl includes") - set(OPENSSL_LINKER_FLAGS "-L${OPENSSL_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find openssl") -+ -+ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) -+ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") -+ endif() - - ExternalProject_Add(OPENSSL - SOURCE_DIR ${OPENSSL_SOURCE_DIR} -@@ -82,6 +93,7 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DANDROID_ABI=${ANDROID_ABI} - -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN} -+ ${EXTRA_ARGS} - -DANDROID_STL=${ANDROID_STL} - -DCMAKE_INSTALL_PREFIX=${OPENSSL_INSTALL_DIR} - -DCMAKE_CXX_FLAGS=${OPENSSL_CXX_FLAGS} -@@ -120,6 +132,11 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) - set(CURL_USE_ZLIB "OFF") - endif() - -+ if (VCPKG_CHAINLOAD_TOOLCHAIN_FILE) -+ set(EXTRA_ARGS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" -+ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}") -+ endif() -+ - ExternalProject_Add(CURL - DEPENDS ${CURL_OPENSSL_DEPENDENCY} ${CURL_ZLIB_DEPENDENCY} - SOURCE_DIR ${CURL_SOURCE_DIR} -@@ -130,6 +147,7 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB) - CMAKE_ARGS - -C ${AWS_NATIVE_SDK_ROOT}/android-build/CurlAndroidCrossCompile.cmake - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -+ ${EXTRA_ARGS} - -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION} - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DANDROID_ABI=${ANDROID_ABI} diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 19c0b606a14796..2515186b06995c 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -9,8 +9,6 @@ vcpkg_from_github( PATCHES patch-relocatable-rpath.patch fix-AWSSDKCONFIG.patch - build-external-allow-vcpkg-chaining.patch - allow-vcpkg-chaining.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) @@ -24,10 +22,15 @@ if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) elseif (VCPKG_TARGET_IS_ANDROID) find_package(Git) + if(NOT GIT_EXECUTABLE) + include(${CMAKE_CURRENT_LIST_DIR}/FindGit.cmake) + endif() + set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" "-DGIT_EXECUTABLE=${GIT_EXECUTABLE}" "-DGIT_FOUND=${GIT_FOUND}" "-DGIT_VERSION_STRING=${GIT_VERSION_STRING}" + "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" ) else() set(rpath "\$ORIGIN") From 089e338e008d1f12eb74ac783b0b7b0664cd674e Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Wed, 20 Jan 2021 23:13:47 -0300 Subject: [PATCH 15/68] Bump port version --- ports/aws-sdk-cpp/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 30cc828a5c05f5..204c8499baeedc 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,6 +1,6 @@ Source: aws-sdk-cpp Version: 1.8.126 -Port-Version: 6 +Port-Version: 7 Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows&!android), curl (!uwp&!windows&!android), aws-c-event-stream, zlib(!android) From d8b6e24b71995fce1462617e244e59cf68cdbf67 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Wed, 20 Jan 2021 23:14:30 -0300 Subject: [PATCH 16/68] Bump version files --- port_versions/a-/aws-sdk-cpp.json | 5 +++++ port_versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/port_versions/a-/aws-sdk-cpp.json b/port_versions/a-/aws-sdk-cpp.json index 7fdedcdd14a25b..a7ba31f2366a12 100644 --- a/port_versions/a-/aws-sdk-cpp.json +++ b/port_versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe3564d9e640244b3ea0769292132bd30b937952", + "version-string": "1.8.126", + "port-version": 7 + }, { "git-tree": "d12259b9a98bb3bc8f5df4c5d2417f899e9a6623", "version-string": "1.8.126", diff --git a/port_versions/baseline.json b/port_versions/baseline.json index cc197e185afee3..6dc2872a2ea30b 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -234,7 +234,7 @@ }, "aws-sdk-cpp": { "baseline": "1.8.126", - "port-version": 6 + "port-version": 7 }, "azmq": { "baseline": "2020-03-03", From f93e994eef8682125254a329130df8722efd1baa Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 22 Jan 2021 02:40:18 -0300 Subject: [PATCH 17/68] Remove redundant file --- ports/aws-sdk-cpp/CONTROL | 539 -------------------------------------- 1 file changed, 539 deletions(-) delete mode 100644 ports/aws-sdk-cpp/CONTROL diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL deleted file mode 100644 index 204c8499baeedc..00000000000000 --- a/ports/aws-sdk-cpp/CONTROL +++ /dev/null @@ -1,539 +0,0 @@ -Source: aws-sdk-cpp -Version: 1.8.126 -Port-Version: 7 -Homepage: https://github.com/aws/aws-sdk-cpp -Description: AWS SDK for C++ -Build-Depends: openssl (!uwp&!windows&!android), curl (!uwp&!windows&!android), aws-c-event-stream, zlib(!android) -Default-Features: dynamodb, s3, kinesis -# Automatically generated by generateFeatures.ps1 - -Feature: access-management -Description: C++ SDK for the AWS access-management service - -Feature: acm -Description: C++ SDK for the AWS acm service - -Feature: acm-pca -Description: C++ SDK for the AWS acm-pca service - -Feature: alexaforbusiness -Description: C++ SDK for the AWS alexaforbusiness service - -Feature: amplify -Description: C++ SDK for the AWS amplify service - -Feature: apigateway -Description: C++ SDK for the AWS apigateway service - -Feature: apigatewaymanagementapi -Description: C++ SDK for the AWS apigatewaymanagementapi service - -Feature: apigatewayv2 -Description: C++ SDK for the AWS apigatewayv2 service - -Feature: application-autoscaling -Description: C++ SDK for the AWS application-autoscaling service - -Feature: appmesh -Description: C++ SDK for the AWS appmesh service - -Feature: appstream -Description: C++ SDK for the AWS appstream service - -Feature: appsync -Description: C++ SDK for the AWS appsync service - -Feature: athena -Description: C++ SDK for the AWS athena service - -Feature: autoscaling -Description: C++ SDK for the AWS autoscaling service - -Feature: autoscaling-plans -Description: C++ SDK for the AWS autoscaling-plans service - -Feature: awsmigrationhub -Description: C++ SDK for the AWS AWSMigrationHub service - -Feature: awstransfer -Description: C++ SDK for the AWS awstransfer service - -Feature: backup -Description: C++ SDK for the AWS backup service - -Feature: batch -Description: C++ SDK for the AWS batch service - -Feature: budgets -Description: C++ SDK for the AWS budgets service - -Feature: ce -Description: C++ SDK for the AWS ce service - -Feature: chime -Description: C++ SDK for the AWS chime service - -Feature: cloud9 -Description: C++ SDK for the AWS cloud9 service - -Feature: clouddirectory -Description: C++ SDK for the AWS clouddirectory service - -Feature: cloudformation -Description: C++ SDK for the AWS cloudformation service - -Feature: cloudfront -Description: C++ SDK for the AWS cloudfront service - -Feature: cloudhsm -Description: C++ SDK for the AWS cloudhsm service - -Feature: cloudhsmv2 -Description: C++ SDK for the AWS cloudhsmv2 service - -Feature: cloudsearch -Description: C++ SDK for the AWS cloudsearch service - -Feature: cloudsearchdomain -Description: C++ SDK for the AWS cloudsearchdomain service - -Feature: cloudtrail -Description: C++ SDK for the AWS cloudtrail service - -Feature: codebuild -Description: C++ SDK for the AWS codebuild service - -Feature: codecommit -Description: C++ SDK for the AWS codecommit service - -Feature: codedeploy -Description: C++ SDK for the AWS codedeploy service - -Feature: codepipeline -Description: C++ SDK for the AWS codepipeline service - -Feature: codestar -Description: C++ SDK for the AWS codestar service - -Feature: cognito-identity -Description: C++ SDK for the AWS cognito-identity service - -Feature: cognito-idp -Description: C++ SDK for the AWS cognito-idp service - -Feature: cognito-sync -Description: C++ SDK for the AWS cognito-sync service - -Feature: comprehend -Description: C++ SDK for the AWS comprehend service - -Feature: comprehendmedical -Description: C++ SDK for the AWS comprehendmedical service - -Feature: config -Description: C++ SDK for the AWS config service - -Feature: connect -Description: C++ SDK for the AWS connect service - -Feature: cur -Description: C++ SDK for the AWS cur service - -Feature: datapipeline -Description: C++ SDK for the AWS datapipeline service - -Feature: datasync -Description: C++ SDK for the AWS datasync service - -Feature: dax -Description: C++ SDK for the AWS dax service - -Feature: devicefarm -Description: C++ SDK for the AWS devicefarm service - -Feature: directconnect -Description: C++ SDK for the AWS directconnect service - -Feature: discovery -Description: C++ SDK for the AWS discovery service - -Feature: dlm -Description: C++ SDK for the AWS dlm service - -Feature: dms -Description: C++ SDK for the AWS dms service - -Feature: docdb -Description: C++ SDK for the AWS docdb service - -Feature: ds -Description: C++ SDK for the AWS ds service - -Feature: dynamodb -Description: C++ SDK for the AWS dynamodb service - -Feature: dynamodbstreams -Description: C++ SDK for the AWS dynamodbstreams service - -Feature: ec2 -Description: C++ SDK for the AWS ec2 service - -Feature: ecr -Description: C++ SDK for the AWS ecr service - -Feature: ecs -Description: C++ SDK for the AWS ecs service - -Feature: eks -Description: C++ SDK for the AWS eks service - -Feature: elasticache -Description: C++ SDK for the AWS elasticache service - -Feature: elasticbeanstalk -Description: C++ SDK for the AWS elasticbeanstalk service - -Feature: elasticfilesystem -Description: C++ SDK for the AWS elasticfilesystem service - -Feature: elasticloadbalancing -Description: C++ SDK for the AWS elasticloadbalancing service - -Feature: elasticloadbalancingv2 -Description: C++ SDK for the AWS elasticloadbalancingv2 service - -Feature: elasticmapreduce -Description: C++ SDK for the AWS elasticmapreduce service - -Feature: elastictranscoder -Description: C++ SDK for the AWS elastictranscoder service - -Feature: email -Description: C++ SDK for the AWS email service - -Feature: es -Description: C++ SDK for the AWS es service - -Feature: events -Description: C++ SDK for the AWS events service - -Feature: firehose -Description: C++ SDK for the AWS firehose service - -Feature: fms -Description: C++ SDK for the AWS fms service - -Feature: fsx -Description: C++ SDK for the AWS fsx service - -Feature: gamelift -Description: C++ SDK for the AWS gamelift service - -Feature: glacier -Description: C++ SDK for the AWS glacier service - -Feature: globalaccelerator -Description: C++ SDK for the AWS globalaccelerator service - -Feature: glue -Description: C++ SDK for the AWS glue service - -Feature: greengrass -Description: C++ SDK for the AWS greengrass service - -Feature: guardduty -Description: C++ SDK for the AWS guardduty service - -Feature: health -Description: C++ SDK for the AWS health service - -Feature: iam -Description: C++ SDK for the AWS iam service - -Feature: identity-management -Description: C++ SDK for the AWS identity-management service - -Feature: importexport -Description: C++ SDK for the AWS importexport service - -Feature: inspector -Description: C++ SDK for the AWS inspector service - -Feature: iot -Description: C++ SDK for the AWS iot service - -Feature: iot-data -Description: C++ SDK for the AWS iot-data service - -Feature: iot-jobs-data -Description: C++ SDK for the AWS iot-jobs-data service - -Feature: iot1click-devices -Description: C++ SDK for the AWS iot1click-devices service - -Feature: iot1click-projects -Description: C++ SDK for the AWS iot1click-projects service - -Feature: iotanalytics -Description: C++ SDK for the AWS iotanalytics service - -Feature: kafka -Description: C++ SDK for the AWS kafka service - -Feature: kinesis -Description: C++ SDK for the AWS kinesis service - -Feature: kinesis-video-archived-media -Description: C++ SDK for the AWS kinesis-video-archived-media service - -Feature: kinesis-video-media -Description: C++ SDK for the AWS kinesis-video-media service - -Feature: kinesisanalytics -Description: C++ SDK for the AWS kinesisanalytics service - -Feature: kinesisanalyticsv2 -Description: C++ SDK for the AWS kinesisanalyticsv2 service - -Feature: kinesisvideo -Description: C++ SDK for the AWS kinesisvideo service - -Feature: kms -Description: C++ SDK for the AWS kms service - -Feature: lambda -Description: C++ SDK for the AWS lambda service - -Feature: lex -Description: C++ SDK for the AWS lex service - -Feature: lex-models -Description: C++ SDK for the AWS lex-models service - -Feature: license-manager -Description: C++ SDK for the AWS license-manager service - -Feature: lightsail -Description: C++ SDK for the AWS lightsail service - -Feature: logs -Description: C++ SDK for the AWS logs service - -Feature: machinelearning -Description: C++ SDK for the AWS machinelearning service - -Feature: macie -Description: C++ SDK for the AWS macie service - -Feature: marketplace-entitlement -Description: C++ SDK for the AWS marketplace-entitlement service - -Feature: marketplacecommerceanalytics -Description: C++ SDK for the AWS marketplacecommerceanalytics service - -Feature: mediaconnect -Description: C++ SDK for the AWS mediaconnect service - -Feature: mediaconvert -Description: C++ SDK for the AWS mediaconvert service - -Feature: medialive -Description: C++ SDK for the AWS medialive service - -Feature: mediapackage -Description: C++ SDK for the AWS mediapackage service - -Feature: mediastore -Description: C++ SDK for the AWS mediastore service - -Feature: mediastore-data -Description: C++ SDK for the AWS mediastore-data service - -Feature: mediatailor -Description: C++ SDK for the AWS mediatailor service - -Feature: meteringmarketplace -Description: C++ SDK for the AWS meteringmarketplace service - -Feature: mobile -Description: C++ SDK for the AWS mobile service - -Feature: mobileanalytics -Description: C++ SDK for the AWS mobileanalytics service - -Feature: monitoring -Description: C++ SDK for the AWS monitoring service - -Feature: mq -Description: C++ SDK for the AWS mq service - -Feature: mturk-requester -Description: C++ SDK for the AWS mturk-requester service - -Feature: neptune -Description: C++ SDK for the AWS neptune service - -Feature: opsworks -Description: C++ SDK for the AWS opsworks service - -Feature: opsworkscm -Description: C++ SDK for the AWS opsworkscm service - -Feature: organizations -Description: C++ SDK for the AWS organizations service - -Feature: pi -Description: C++ SDK for the AWS pi service - -Feature: pinpoint -Description: C++ SDK for the AWS pinpoint service - -Feature: pinpoint-email -Description: C++ SDK for the AWS pinpoint-email service - -Feature: polly -Description: C++ SDK for the AWS polly service - -Feature: pricing -Description: C++ SDK for the AWS pricing service - -Feature: queues -Description: C++ SDK for the AWS queues service - -Feature: quicksight -Description: C++ SDK for the AWS quicksight service - -Feature: ram -Description: C++ SDK for the AWS ram service - -Feature: rds -Description: C++ SDK for the AWS rds service - -Feature: rds-data -Description: C++ SDK for the AWS rds-data service - -Feature: redshift -Description: C++ SDK for the AWS redshift service - -Feature: rekognition -Description: C++ SDK for the AWS rekognition service - -Feature: resource-groups -Description: C++ SDK for the AWS resource-groups service - -Feature: resourcegroupstaggingapi -Description: C++ SDK for the AWS resourcegroupstaggingapi service - -Feature: robomaker -Description: C++ SDK for the AWS robomaker service - -Feature: route53 -Description: C++ SDK for the AWS route53 service - -Feature: route53domains -Description: C++ SDK for the AWS route53domains service - -Feature: route53resolver -Description: C++ SDK for the AWS route53resolver service - -Feature: s3 -Description: C++ SDK for the AWS s3 service - -Feature: s3-encryption -Description: C++ SDK for the AWS s3-encryption service - -Feature: s3control -Description: C++ SDK for the AWS s3control service - -Feature: sagemaker -Description: C++ SDK for the AWS sagemaker service - -Feature: sagemaker-runtime -Description: C++ SDK for the AWS sagemaker-runtime service - -Feature: sdb -Description: C++ SDK for the AWS sdb service - -Feature: secretsmanager -Description: C++ SDK for the AWS secretsmanager service - -Feature: securityhub -Description: C++ SDK for the AWS securityhub service - -Feature: serverlessrepo -Description: C++ SDK for the AWS serverlessrepo service - -Feature: servicecatalog -Description: C++ SDK for the AWS servicecatalog service - -Feature: servicediscovery -Description: C++ SDK for the AWS servicediscovery service - -Feature: shield -Description: C++ SDK for the AWS shield service - -Feature: signer -Description: C++ SDK for the AWS signer service - -Feature: sms -Description: C++ SDK for the AWS sms service - -Feature: sms-voice -Description: C++ SDK for the AWS sms-voice service - -Feature: snowball -Description: C++ SDK for the AWS snowball service - -Feature: sns -Description: C++ SDK for the AWS sns service - -Feature: sqs -Description: C++ SDK for the AWS sqs service - -Feature: ssm -Description: C++ SDK for the AWS ssm service - -Feature: states -Description: C++ SDK for the AWS states service - -Feature: storagegateway -Description: C++ SDK for the AWS storagegateway service - -Feature: sts -Description: C++ SDK for the AWS sts service - -Feature: support -Description: C++ SDK for the AWS support service - -Feature: swf -Description: C++ SDK for the AWS swf service - -Feature: text-to-speech -Description: C++ SDK for the AWS text-to-speech service - -Feature: transcribe -Description: C++ SDK for the AWS transcribe service - -Feature: transfer -Description: C++ SDK for the AWS transfer service - -Feature: translate -Description: C++ SDK for the AWS translate service - -Feature: waf -Description: C++ SDK for the AWS waf service - -Feature: waf-regional -Description: C++ SDK for the AWS waf-regional service - -Feature: workdocs -Description: C++ SDK for the AWS workdocs service - -Feature: workmail -Description: C++ SDK for the AWS workmail service - -Feature: workspaces -Description: C++ SDK for the AWS workspaces service - -Feature: xray -Description: C++ SDK for the AWS xray service From 2396d6de0db206935dfead94975231669566e7aa Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 22 Jan 2021 02:42:14 -0300 Subject: [PATCH 18/68] Bump port version --- ports/aws-sdk-cpp/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index f1f9763cfc0639..0f0f27204b304f 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": 6, + "port-version": 7, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "dependencies": [ From 9e30404723819bf308e3c7b105614af47db94a87 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 22 Jan 2021 02:43:00 -0300 Subject: [PATCH 19/68] Fix version files --- versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 8077f6434a28ee..0b175063fcffb4 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f952663ddd3fc3b8e00a6595e9b5a996d81145b0", + "version": "1.8.126", + "port-version": 7 + }, { "git-tree": "011de9c924af9f41faddda1a6bc2bf080eee6679", "version": "1.8.126", diff --git a/versions/baseline.json b/versions/baseline.json index ca9b3fada78baf..1e736a049e3758 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -234,7 +234,7 @@ }, "aws-sdk-cpp": { "baseline": "1.8.126", - "port-version": 6 + "port-version": 7 }, "azmq": { "baseline": "2020-03-03", From e28610dceabeeae682366993317044c9d0c7babb Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 22 Jan 2021 11:56:54 -0300 Subject: [PATCH 20/68] Do not build curl, zlib and OpenSSL --- ports/aws-sdk-cpp/portfile.cmake | 3 +++ ports/curl/CurlAndroidCrossCompile.cmake | 12 ++++++++++++ ports/curl/portfile.cmake | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 ports/curl/CurlAndroidCrossCompile.cmake diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 2515186b06995c..29177b3aea9f96 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -31,6 +31,9 @@ elseif (VCPKG_TARGET_IS_ANDROID) "-DGIT_FOUND=${GIT_FOUND}" "-DGIT_VERSION_STRING=${GIT_VERSION_STRING}" "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" + "-DANDROID_BUILD_ZLIB=FALSE" + "-DANDROID_BUILD_CURL=FALSE" + "-DANDROID_BUILD_OPENSSL=FALSE" ) else() set(rpath "\$ORIGIN") diff --git a/ports/curl/CurlAndroidCrossCompile.cmake b/ports/curl/CurlAndroidCrossCompile.cmake new file mode 100644 index 00000000000000..4683d43c27a475 --- /dev/null +++ b/ports/curl/CurlAndroidCrossCompile.cmake @@ -0,0 +1,12 @@ +# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0. +# + +SET( HAVE_GLIBC_STRERROR_R 1 CACHE STRING "Result from TRY_RUN" FORCE) +SET( HAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE) +SET( HAVE_POSIX_STRERROR_R 0 CACHE STRING "Result from TRY_RUN" FORCE) +SET( HAVE_POSIX_STRERROR_R__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE) +SET( HAVE_POLL_FINE_EXITCODE 0 CACHE STRING "Result from TRY_RUN" FORCE ) +SET( HAVE_POLL_FINE_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE) +SET( OPENSSL_CRYPTO_LIBRARY crypto CACHE STRING "Set crypto" FORCE ) +SET( OPENSSL_SSL_LIBRARY ssl CACHE STRING "Set ssl" FORCE ) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 6e18aecd05d2ef..e3f46edcf06021 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -64,12 +64,17 @@ if(VCPKG_TARGET_IS_UWP) ) endif() +if(VCPKG_TARGET_IS_ANDROID) + set(EXTRA_ARGS "-C ${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ${UWP_OPTIONS} ${SECTRANSP_OPTIONS} + -C "${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake" -DBUILD_TESTING=OFF -DENABLE_MANUAL=OFF -DCURL_STATICLIB=${CURL_STATICLIB} @@ -185,6 +190,8 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_pkgconfig() elseif(VCPKG_TARGET_IS_LINUX) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread dl c) +elseif(VCPKG_TARGET_IS_ANDROID) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) From 32ed0be795deab3c7b09b6d63b89b0c1bd1c0b78 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 15 Feb 2021 17:11:12 -0300 Subject: [PATCH 21/68] Typo de pkgconfig script --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 8f0d950eef5b70..a629ac8c91f40c 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -1,7 +1,7 @@ #[===[.md: # vcpkg_fixup_pkgconfig -Fix common paths in *.pc files and make everything relativ to $(prefix) +Fix common paths in *.pc files and make everything relative to $(prefix) ## Usage ```cmake From 9d18e10b04915522f6f4c6656e7901603511f03e Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 15 Feb 2021 19:00:50 -0300 Subject: [PATCH 22/68] Fix cURL build for Android --- ports/curl/0009_fix_openssl_config.patch | 57 +++++++++++++++---- ports/curl/CONTROL | 2 +- ports/curl/portfile.cmake | 72 +++++++++++++++--------- 3 files changed, 91 insertions(+), 40 deletions(-) diff --git a/ports/curl/0009_fix_openssl_config.patch b/ports/curl/0009_fix_openssl_config.patch index d7fc216435ca37..d615cd19c38313 100644 --- a/ports/curl/0009_fix_openssl_config.patch +++ b/ports/curl/0009_fix_openssl_config.patch @@ -1,12 +1,45 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a13333..5a7ece0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -361,6 +361,7 @@ if(CMAKE_USE_SECTRANSP) - list(APPEND CURL_LIBS "${COREFOUNDATION_FRAMEWORK}" "${SECURITY_FRAMEWORK}") - endif() - -+set(USE_OPENSSL OFF) - if(CMAKE_USE_OPENSSL) - find_package(OpenSSL REQUIRED) - set(SSL_ENABLED ON) +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (revision e052859759b34d0e05ce0f17244873e5cd7b457b) ++++ b/CMakeLists.txt (date 1613423958921) +@@ -383,20 +383,30 @@ + endif() + + if(CMAKE_USE_OPENSSL) +- find_package(OpenSSL REQUIRED) +- set(SSL_ENABLED ON) +- set(USE_OPENSSL ON) ++ if(NOT PKG_CONFIG_FOUND) ++ message(WARNING "pkg-config not found, setting paths manually!" ) ++ ++ list(APPEND CURL_LIBS ${OPENSSL_LIBRARY} ${CRYPT_LIBRARY}) ++ message(WARNING ${CURL_LIBS}) ++ message(WARNING ${OPENSSL_INCLUDE}) ++ include_directories("${OPENSSL_INCLUDE}") ++ else() ++ find_package(OpenSSL REQUIRED) + +- # Depend on OpenSSL via imported targets if supported by the running +- # version of CMake. This allows our dependents to get our dependencies +- # transitively. +- if(NOT CMAKE_VERSION VERSION_LESS 3.4) +- list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto) +- else() +- list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) +- include_directories(${OPENSSL_INCLUDE_DIR}) ++ # Depend on OpenSSL via imported targets if supported by the running ++ # version of CMake. This allows our dependents to get our dependencies ++ # transitively. ++ if(NOT CMAKE_VERSION VERSION_LESS 3.4) ++ list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto) ++ else() ++ list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) ++ include_directories(${OPENSSL_INCLUDE_DIR}) ++ endif() + endif() + ++ set(SSL_ENABLED ON) ++ set(USE_OPENSSL ON) ++ + set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) + check_include_file("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H) + check_include_file("openssl/err.h" HAVE_OPENSSL_ERR_H) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 1ab6325cd2408c..8a1f727eb4216e 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Port-Version: 3 +Port-Version: 4 Version: 7.74.0 Build-Depends: zlib Homepage: https://github.com/curl/curl diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 349abb05c1b5de..aa566d9f6eed6f 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -43,7 +43,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS schannel CMAKE_USE_SCHANNEL sectransp CMAKE_USE_SECTRANSP idn2 CMAKE_USE_IDN2 - + INVERTED_FEATURES non-http HTTP_ONLY ) @@ -65,23 +65,41 @@ if(VCPKG_TARGET_IS_UWP) endif() if(VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-C ${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake") + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + ${UWP_OPTIONS} + -C "${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake" + -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libssl.so" + -DCRYPT_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libcrypto.so" + -DOPENSSL_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ${SECTRANSP_OPTIONS} + -DBUILD_TESTING=OFF + -DENABLE_MANUAL=OFF + -DCURL_STATICLIB=${CURL_STATICLIB} + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON + -DENABLE_DEBUG=ON + -DCURL_CA_FALLBACK=ON + ) + +else() + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + ${UWP_OPTIONS} + ${SECTRANSP_OPTIONS} + -DBUILD_TESTING=OFF + -DENABLE_MANUAL=OFF + -DCURL_STATICLIB=${CURL_STATICLIB} + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON + -DENABLE_DEBUG=ON + -DCURL_CA_FALLBACK=ON + ) + endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} - ${UWP_OPTIONS} - ${SECTRANSP_OPTIONS} - -C "${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake" - -DBUILD_TESTING=OFF - -DENABLE_MANUAL=OFF - -DCURL_STATICLIB=${CURL_STATICLIB} - -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON - -DENABLE_DEBUG=ON - -DCURL_CA_FALLBACK=ON -) vcpkg_install_cmake() @@ -132,14 +150,14 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssh2.lib" "-lssh2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/cares.lib" "-lcares") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlicommon.lib" "-lbrotlicommon") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlidec.lib" "-lbrotlidec") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlidec.lib" "-lbrotlidec") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "-lpthreadVC3d") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " ${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " ${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -loptimized" "") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -ldebug" "") - + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -ldebug" "") + elseif(VCPKG_TARGET_IS_LINUX) - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "-lcurl" "-lcurl-d") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "-lcurl" "-lcurl-d") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a" "-lssl") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a" "-lcrypto") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libmbedtls.a" "-lmbedtls") @@ -147,7 +165,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libmbedcrypto.a" "-lmbedcrypto") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libnghttp2.a" "-lnghttp2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssh2.a" "-lssh2") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcares.a" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcares.a" "-lcares") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" "-lz") endif() file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) @@ -167,11 +185,11 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssh2.lib" "-lssh2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/cares.lib" "-lcares") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlicommon.lib" "-lbrotlicommon") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlidec.lib" "-lbrotlidec") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlidec.lib" "-lbrotlidec") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "-lpthreadVC3") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " ${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " ${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -loptimized" "") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -ldebug" "") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -ldebug" "") elseif(VCPKG_TARGET_IS_LINUX) #vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "-lcurl" "-lcurl") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssl.a" "-lssl") @@ -181,12 +199,12 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libmbedcrypto.a" "-lmbedcrypto") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libnghttp2.a" "-lnghttp2") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssh2.a" "-lssh2") - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libcares.a" "-lcares") + vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libcares.a" "-lcares") vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libz.a" "-lz") endif() file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) endif() -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_pkgconfig() elseif(VCPKG_TARGET_IS_LINUX) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread dl c) From 91b091f64847cf7748c4bdb6342b6df74885e10a Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 16 Feb 2021 04:49:29 -0300 Subject: [PATCH 23/68] Add required flags --- ports/aws-sdk-cpp/portfile.cmake | 5 +++++ ports/curl/CurlAndroidCrossCompile.cmake | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 29177b3aea9f96..5ed115aa080283 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -34,6 +34,11 @@ elseif (VCPKG_TARGET_IS_ANDROID) "-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") diff --git a/ports/curl/CurlAndroidCrossCompile.cmake b/ports/curl/CurlAndroidCrossCompile.cmake index 4683d43c27a475..43a5a1492441a4 100644 --- a/ports/curl/CurlAndroidCrossCompile.cmake +++ b/ports/curl/CurlAndroidCrossCompile.cmake @@ -8,5 +8,9 @@ SET( HAVE_POSIX_STRERROR_R 0 CACHE STRING "Result from TRY_RUN" FORCE) SET( HAVE_POSIX_STRERROR_R__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE) SET( HAVE_POLL_FINE_EXITCODE 0 CACHE STRING "Result from TRY_RUN" FORCE ) SET( HAVE_POLL_FINE_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE) +SET( CURL_HAS_H2_EXITCODE 0 CACHE STRING "Result from TRY_RUN" FORCE ) +SET( CURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE) +SET( CURL_HAS_TLS_PROXY_EXITCODE 0 CACHE STRING "Result from TRY_RUN" FORCE ) +SET( CURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE) SET( OPENSSL_CRYPTO_LIBRARY crypto CACHE STRING "Set crypto" FORCE ) SET( OPENSSL_SSL_LIBRARY ssl CACHE STRING "Set ssl" FORCE ) From 41fc10df2708703c3e9e1c12e423af62993bd8c2 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 16 Feb 2021 04:57:20 -0300 Subject: [PATCH 24/68] Revert macro change --- docs/maintainers/vcpkg_fixup_pkgconfig.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers/vcpkg_fixup_pkgconfig.md b/docs/maintainers/vcpkg_fixup_pkgconfig.md index 23cee61429fb84..816f0cc1fa31d7 100644 --- a/docs/maintainers/vcpkg_fixup_pkgconfig.md +++ b/docs/maintainers/vcpkg_fixup_pkgconfig.md @@ -1,6 +1,6 @@ # vcpkg_fixup_pkgconfig -Fix common paths in *.pc files and make everything relativ to $(prefix) +Fix common paths in *.pc files and make everything relative to $(prefix) ## Usage ```cmake From fea8318458f6fe0001c62b5568a5306b0a87736c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 16 Feb 2021 14:12:21 -0300 Subject: [PATCH 25/68] Fix curl build for other platforms --- ports/curl/0009_fix_openssl_config.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/curl/0009_fix_openssl_config.patch b/ports/curl/0009_fix_openssl_config.patch index d615cd19c38313..db6dc4037e18f4 100644 --- a/ports/curl/0009_fix_openssl_config.patch +++ b/ports/curl/0009_fix_openssl_config.patch @@ -8,7 +8,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - find_package(OpenSSL REQUIRED) - set(SSL_ENABLED ON) - set(USE_OPENSSL ON) -+ if(NOT PKG_CONFIG_FOUND) ++ if(NOT PKG_CONFIG_FOUND and ANDROID) + message(WARNING "pkg-config not found, setting paths manually!" ) + + list(APPEND CURL_LIBS ${OPENSSL_LIBRARY} ${CRYPT_LIBRARY}) From fc2aee2e839eb31334988450057a559ee191da75 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 16 Feb 2021 14:27:20 -0300 Subject: [PATCH 26/68] Fix curl build for other platforms --- ports/curl/0009_fix_openssl_config.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/curl/0009_fix_openssl_config.patch b/ports/curl/0009_fix_openssl_config.patch index db6dc4037e18f4..b4104665928953 100644 --- a/ports/curl/0009_fix_openssl_config.patch +++ b/ports/curl/0009_fix_openssl_config.patch @@ -8,12 +8,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - find_package(OpenSSL REQUIRED) - set(SSL_ENABLED ON) - set(USE_OPENSSL ON) -+ if(NOT PKG_CONFIG_FOUND and ANDROID) ++ if(ANDROID) + message(WARNING "pkg-config not found, setting paths manually!" ) + + list(APPEND CURL_LIBS ${OPENSSL_LIBRARY} ${CRYPT_LIBRARY}) -+ message(WARNING ${CURL_LIBS}) -+ message(WARNING ${OPENSSL_INCLUDE}) ++ message(STATUS ${CURL_LIBS}) ++ message(STATUS ${OPENSSL_INCLUDE}) + include_directories("${OPENSSL_INCLUDE}") + else() + find_package(OpenSSL REQUIRED) From 1609b8c1c36fb9b3cc7191b770d447e392e5d74f Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Wed, 17 Feb 2021 17:59:03 -0800 Subject: [PATCH 27/68] [vcpkg baseline][gsoap] Update to 2.8.111 --- ports/gsoap/CONTROL | 2 +- ports/gsoap/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/gsoap/CONTROL b/ports/gsoap/CONTROL index ff4434872abc2b..80908bf0ce49db 100644 --- a/ports/gsoap/CONTROL +++ b/ports/gsoap/CONTROL @@ -1,5 +1,5 @@ Source: gsoap -Version: 2.8.105 +Version: 2.8.111 Build-Depends: curl Homepage: https://sourceforge.net/projects/gsoap2/ Description: The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings. diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake index 1a4e75adbb63dc..f192e6e58ed22a 100644 --- a/ports/gsoap/portfile.cmake +++ b/ports/gsoap/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO gsoap2 REF gsoap-2.8 - FILENAME "gsoap_2.8.105.zip" - SHA512 3b7b66ef738e9ba78f0c9d5ec141faab102dc2ed7c528e84358d530ec8cb913c559438bb86ae0f22e0736c4cd9be9e74f364a44257189ccaa1e6d001317f99de + FILENAME "gsoap_2.8.111.zip" + SHA512 9cc7f0252f82ec18d19784aba2d913e70620fc09955d148a31e2c89bba4915d20a6b592bd7b6a747f89dc3ab17b2bc542d672933fa1a3acbf59bc3d1f49fe31b PATCHES fix-build-in-windows.patch ) From 540cf12d8700afb321243ae1536c4eb970d1e0e9 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Wed, 17 Feb 2021 18:00:22 -0800 Subject: [PATCH 28/68] Update versions --- versions/baseline.json | 2 +- versions/g-/gsoap.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 7aa24c167910ba..065db5b374b498 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2325,7 +2325,7 @@ "port-version": 0 }, "gsoap": { - "baseline": "2.8.105", + "baseline": "2.8.111", "port-version": 0 }, "gtest": { diff --git a/versions/g-/gsoap.json b/versions/g-/gsoap.json index bad3effc8ba2b7..598289f7f96ff4 100644 --- a/versions/g-/gsoap.json +++ b/versions/g-/gsoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "010523cbf786f4563ccef87dc0d28b13083f06f0", + "version-string": "2.8.111", + "port-version": 0 + }, { "git-tree": "a376e6e1ce84fa44f521c1cd75ac61ad71d811d9", "version-string": "2.8.105", From 948358c37deb334ffeefebb1902de8d599d3162c Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 18 Feb 2021 18:12:36 -0800 Subject: [PATCH 29/68] [ktx/otl] Update download hash --- ports/ktx/portfile.cmake | 2 +- ports/ktx/vcpkg.json | 2 +- ports/otl/CONTROL | 1 + ports/otl/portfile.cmake | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index a4ef51f4fbdcbc..b3ef07b1b49a2b 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/KTX-Software REF v${PORT_VERSION} - SHA512 8c63be2a7c55b8fdb8c8aee1f7cacdc2105e54061691c69cddbd3bed49f8e907262cc3ae83dfd723e76f0911bd6c85f5bbc19347998988a1fc6ecae26bfecf33 + SHA512 0ee0672413eaa8cbfacab13bfab9935be23fadcd63253012d9710f3f9ce9b0d62c43d50c652e47cb44d2878b20377026e65f3d37cdb1dd36b1c0241da250606a HEAD_REF master PATCHES 0001-Use-vcpkg-zstd.patch diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index 0e9be873261c9b..42d06e8ee92b3a 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ktx", "version-string": "4.0.0-beta5", - "port-version": 1, + "port-version": 2, "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them", "homepage": "https://github.com/KhronosGroup/KTX-Software", "supports": "!(uwp | x86)", diff --git a/ports/otl/CONTROL b/ports/otl/CONTROL index 6b6bfe5e51f95f..66e2097a7bb62d 100644 --- a/ports/otl/CONTROL +++ b/ports/otl/CONTROL @@ -1,4 +1,5 @@ Source: otl Version: 4.0.455 +Port-Version: 1 Description: Oracle, Odbc and DB2-CLI Template Library Homepage: http://otl.sourceforge.net/ diff --git a/ports/otl/portfile.cmake b/ports/otl/portfile.cmake index 82a289a9927e83..4e40ec8b51ca78 100644 --- a/ports/otl/portfile.cmake +++ b/ports/otl/portfile.cmake @@ -3,7 +3,7 @@ set(OTL_VERSION 40455) vcpkg_download_distfile(ARCHIVE URLS "http://otl.sourceforge.net/otlv4_${OTL_VERSION}.zip" FILENAME "otlv4_${OTL_VERSION}.zip" - SHA512 2d5c52af3eafdd93bf7c651de218607b8985acc1fce279d48d9bf58ecf8a012332c8d0b9a33223a6449f343134211e2d7c5412b71efb36ba484bda754e1afc45 + SHA512 d1f777dea53f4451616ef628680d070db1fe53683571bd509f58dba9c1e64fe6caa8a81d2f47876c2128af701ba19dc2e9c5612a57232efca3ad084843f272b6 ) vcpkg_extract_source_archive_ex( From 88919c7364f2392806459d6027aedbaa2e79de45 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 18 Feb 2021 18:13:07 -0800 Subject: [PATCH 30/68] update version record --- versions/baseline.json | 4 ++-- versions/k-/ktx.json | 5 +++++ versions/o-/otl.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 16b8a0f379632e..23c88be443d332 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2798,7 +2798,7 @@ }, "ktx": { "baseline": "4.0.0-beta5", - "port-version": 1 + "port-version": 2 }, "kubazip": { "baseline": "0.1.19", @@ -4442,7 +4442,7 @@ }, "otl": { "baseline": "4.0.455", - "port-version": 0 + "port-version": 1 }, "outcome": { "baseline": "2.1.3", diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index 759c3823151496..77a7ca5eeeaa57 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c58a2446a092aed3f99d6106abd663dd6679fb2", + "version-string": "4.0.0-beta5", + "port-version": 2 + }, { "git-tree": "dcdc8a93a053d7251e14f8b0760a810e5b555ebb", "version-string": "4.0.0-beta5", diff --git a/versions/o-/otl.json b/versions/o-/otl.json index 27ac12beb10f27..dbf2feaa193982 100644 --- a/versions/o-/otl.json +++ b/versions/o-/otl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b022edc3ef4bfc599efb5e8fcf3bc20f1782fa30", + "version-string": "4.0.455", + "port-version": 1 + }, { "git-tree": "a12a87bbab40a9d8c53fde4c2dc38f2f87c99c29", "version-string": "4.0.455", From 85b31c09792dc9a5a9d2a15eed23aade0b93ec46 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 19 Feb 2021 16:09:22 -0300 Subject: [PATCH 31/68] Fix curl build for other platforms --- versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 7a1b09844c1001..bf3ec2ed1a869c 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e8485cc7118aff9fe2a437a2015c4575f16bd6f", + "version": "1.8.126", + "port-version": 7 + }, { "git-tree": "f1baa5b35e752a0576d9d81d70d15b2c44a467db", "version": "1.8.126", diff --git a/versions/baseline.json b/versions/baseline.json index 23c88be443d332..7b245d4e139ea3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1510,7 +1510,7 @@ }, "curl": { "baseline": "7.74.0", - "port-version": 3 + "port-version": 4 }, "curlpp": { "baseline": "2018-06-15-3", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 1a6c8fe75cff2e..c51d72d6acd064 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7772920c05f826f17558333205707dfac104333d", + "version-string": "7.74.0", + "port-version": 4 + }, { "git-tree": "1f69a2a2ce714cb05b0c419b07c4da22ca0f40a6", "version-string": "7.74.0", From 3cc305451f6beb334a99e8f7d3fd378cf79dd0ac Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sat, 20 Feb 2021 05:52:24 -0300 Subject: [PATCH 32/68] Update ports/aws-sdk-cpp/portfile.cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/aws-sdk-cpp/portfile.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 5ed115aa080283..b2de0bd47e1f65 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -20,11 +20,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(rpath "@loader_path") elseif (VCPKG_TARGET_IS_ANDROID) - find_package(Git) - - if(NOT GIT_EXECUTABLE) - include(${CMAKE_CURRENT_LIST_DIR}/FindGit.cmake) - endif() + vcpkg_find_acquire_program(GIT) set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" "-DGIT_EXECUTABLE=${GIT_EXECUTABLE}" From 9b1b63068fa9dd909d5dc9736fb78e0714b0774d Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sat, 20 Feb 2021 05:52:32 -0300 Subject: [PATCH 33/68] Update ports/aws-sdk-cpp/portfile.cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/aws-sdk-cpp/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index b2de0bd47e1f65..742707b301d25a 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -23,7 +23,8 @@ elseif (VCPKG_TARGET_IS_ANDROID) vcpkg_find_acquire_program(GIT) set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" - "-DGIT_EXECUTABLE=${GIT_EXECUTABLE}" + "-DGIT_EXECUTABLE=${GIT}" + "-DGIT_FOUND=${GIT_FOUND}" "-DGIT_VERSION_STRING=${GIT_VERSION_STRING}" "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" From 5be65714a0b39da7692253c50d8ef7572c2fd680 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sat, 20 Feb 2021 14:17:12 -0300 Subject: [PATCH 34/68] Remove FingGit --- ports/aws-sdk-cpp/FindGit.cmake | 181 -------------------------------- 1 file changed, 181 deletions(-) delete mode 100644 ports/aws-sdk-cpp/FindGit.cmake diff --git a/ports/aws-sdk-cpp/FindGit.cmake b/ports/aws-sdk-cpp/FindGit.cmake deleted file mode 100644 index a1d8f2fb5b2a5f..00000000000000 --- a/ports/aws-sdk-cpp/FindGit.cmake +++ /dev/null @@ -1,181 +0,0 @@ -################################################################################ -# -# Program: 3D Slicer -# -# Copyright (c) Kitware Inc. -# -# See COPYRIGHT.txt -# or http://www.slicer.org/copyright/copyright.txt for details. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# This file was originally developed by Jean-Christophe Fillion-Robin, Kitware Inc. -# and was partially funded by NIH grant 3P41RR013218-12S1 -# -################################################################################ - -# -# The module defines the following variables: -# GIT_EXECUTABLE - path to git command line client -# GIT_FOUND - true if the command line client was found -# GIT_VERSION_STRING - the version of git found (since CMake 2.8.8) -# -# If the command line client executable is found the macro -# GIT_WC_INFO( ) -# is defined to extract information of a git working copy at -# a given location. -# -# The macro defines the following variables: -# _WC_REVISION_HASH - Current SHA1 hash -# _WC_REVISION - Current SHA1 hash -# _WC_REVISION_NAME - Name associated with _WC_REVISION_HASH -# _WC_URL - output of command `git config --get remote.origin.url' -# _WC_ROOT - Same value as working copy URL -# _WC_LAST_CHANGED_DATE - date of last commit -# _WC_GITSVN - Set to false -# -# ... and also the following ones if it's a git-svn repository: -# _WC_GITSVN - Set to True if it is a -# _WC_INFO - output of command `git svn info' -# _WC_URL - url of the associated SVN repository -# _WC_ROOT - root url of the associated SVN repository -# _WC_REVISION - current SVN revision number -# _WC_LAST_CHANGED_AUTHOR - author of last commit -# _WC_LAST_CHANGED_DATE - date of last commit -# _WC_LAST_CHANGED_REV - revision of last commit -# _WC_LAST_CHANGED_LOG - last log of base revision -# _WC_COMMIT_COUNT - number of commits in current branch -# -# Example usage: -# find_package(Git) -# if(GIT_FOUND) -# GIT_WC_INFO(${PROJECT_SOURCE_DIR} Project) -# message("Current revision is ${Project_WC_REVISION_HASH}") -# message("git found: ${GIT_EXECUTABLE}") -# endif() -# - -# Look for 'git' or 'eg' (easy git) -# -set(git_names git eg) - -# Prefer .cmd variants on Windows unless running in a Makefile -# in the MSYS shell. -# -if(WIN32) - if(NOT CMAKE_GENERATOR MATCHES "MSYS") - # Note: Due to a bug in 'git.cmd' preventing it from returning the exit code of 'git', - # we excluded it from the list of executables to search. - # See http://code.google.com/p/msysgit/issues/detail?id=428 - # TODO Check if 'git' exists, get the associated version, if the corresponding version - # is known to have a working version of 'git.cmd', use it. - set(git_names git eg.cmd eg) - endif() -endif() - -find_program(GIT_EXECUTABLE ${git_names} - PATHS - "C:/Program Files/Git/bin" - "C:/Program Files (x86)/Git/bin" - DOC "git command line client") -mark_as_advanced(GIT_EXECUTABLE) - -if(GIT_EXECUTABLE) - execute_process(COMMAND ${GIT_EXECUTABLE} --version - OUTPUT_VARIABLE git_version - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) - if (git_version MATCHES "^git version [0-9]") - string(REPLACE "git version " "" GIT_VERSION_STRING "${git_version}") - endif() - unset(git_version) - - macro(GIT_WC_INFO dir prefix) - execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=7 HEAD - WORKING_DIRECTORY ${dir} - ERROR_VARIABLE GIT_error - OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE) - set(${prefix}_WC_REVISION ${${prefix}_WC_REVISION_HASH}) - if(NOT ${GIT_error} EQUAL 0) - message(SEND_ERROR "Command \"${GIT_EXECUTBALE} rev-parse --verify -q --short=7 HEAD\" in directory ${dir} failed with output:\n${GIT_error}") - else() - execute_process(COMMAND ${GIT_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH} - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE ${prefix}_WC_REVISION_NAME - OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() - - execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE ${prefix}_WC_URL - OUTPUT_STRIP_TRAILING_WHITESPACE) - - execute_process(COMMAND ${GIT_EXECUTABLE} show -s --format=%ci ${${prefix}_WC_REVISION_HASH} - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE ${prefix}_show_output - OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REGEX REPLACE "^([0-9][0-9][0-9][0-9]\\-[0-9][0-9]\\-[0-9][0-9]).*" - "\\1" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_show_output}") - - execute_process(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE ${prefix}_WC_COMMIT_COUNT - OUTPUT_STRIP_TRAILING_WHITESPACE) - - set(${prefix}_WC_GITSVN False) - - # Check if this git is likely to be a git-svn repository - execute_process(COMMAND ${GIT_EXECUTABLE} config --get-regexp "^svn-remote" - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE git_config_output - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - if(NOT "${git_config_output}" STREQUAL "") - # In case git-svn is used, attempt to extract svn info - execute_process(COMMAND ${GIT_EXECUTABLE} svn info - WORKING_DIRECTORY ${dir} - TIMEOUT 3 - ERROR_VARIABLE git_svn_info_error - OUTPUT_VARIABLE ${prefix}_WC_INFO - RESULT_VARIABLE git_svn_info_result - OUTPUT_STRIP_TRAILING_WHITESPACE) - - if(${git_svn_info_result} EQUAL 0) - set(${prefix}_WC_GITSVN True) - string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*" - "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}") - string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*" - "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}") - string(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*" - "\\2" ${prefix}_WC_ROOT "${${prefix}_WC_INFO}") - string(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*" - "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}") - string(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*" - "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}") - string(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*" - "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}") - endif() - endif() - - # If there is no 'remote.origin', default to "NA" value and print a warning message. - if(NOT ${prefix}_WC_URL) - message(WARNING "No remote origin set for git repository: ${dir}" ) - set( ${prefix}_WC_URL "NA" ) - else() - set(${prefix}_WC_ROOT ${${prefix}_WC_URL}) - endif() - - endmacro() -endif() - -# Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if -# all listed variables are TRUE - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Git DEFAULT_MSG GIT_EXECUTABLE) \ No newline at end of file From 014c15fe32010766359932f1351c97ad5069a0bd Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sat, 20 Feb 2021 14:28:36 -0300 Subject: [PATCH 35/68] Fix configuration step --- ports/curl/portfile.cmake | 49 ++++++++++++++------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index aa566d9f6eed6f..4bf49902fd1cea 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -65,41 +65,28 @@ if(VCPKG_TARGET_IS_UWP) endif() if(VCPKG_TARGET_IS_ANDROID) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} - ${UWP_OPTIONS} - -C "${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake" - -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libssl.so" + set(ADDITIONAL_SCRIPTS -C "${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake") + set(EXTRA_ARGS -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libssl.so" -DCRYPT_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libcrypto.so" -DOPENSSL_INCLUDE="${CURRENT_INSTALLED_DIR}/include" - ${SECTRANSP_OPTIONS} - -DBUILD_TESTING=OFF - -DENABLE_MANUAL=OFF - -DCURL_STATICLIB=${CURL_STATICLIB} - -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON - -DENABLE_DEBUG=ON - -DCURL_CA_FALLBACK=ON - ) - -else() - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} - ${UWP_OPTIONS} - ${SECTRANSP_OPTIONS} - -DBUILD_TESTING=OFF - -DENABLE_MANUAL=OFF - -DCURL_STATICLIB=${CURL_STATICLIB} - -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON - -DENABLE_DEBUG=ON - -DCURL_CA_FALLBACK=ON - ) - + ) endif() +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + ${UWP_OPTIONS} + ${ADDITIONAL_SCRIPTS} + ${EXTRA_ARGS} + ${SECTRANSP_OPTIONS} + -DBUILD_TESTING=OFF + -DENABLE_MANUAL=OFF + -DCURL_STATICLIB=${CURL_STATICLIB} + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON + -DENABLE_DEBUG=ON + -DCURL_CA_FALLBACK=ON +) vcpkg_install_cmake() From 7814c39d48b7bb09a89e43f19dc7148ace1b2416 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sat, 20 Feb 2021 23:20:50 -0300 Subject: [PATCH 36/68] Bump cURL port version --- ports/curl/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 8a1f727eb4216e..48937a3039a0e8 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Port-Version: 4 +Port-Version: 5 Version: 7.74.0 Build-Depends: zlib Homepage: https://github.com/curl/curl From 63a3177fc5ed23f3d0fde1055c944b4af005c763 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sun, 21 Feb 2021 15:27:35 -0300 Subject: [PATCH 37/68] Bump cURL port version --- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index e27eb1987c4889..c9ada460037967 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1514,7 +1514,7 @@ }, "curl": { "baseline": "7.74.0", - "port-version": 4 + "port-version": 5 }, "curlpp": { "baseline": "2018-06-15-3", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index c51d72d6acd064..12673d1d388e3c 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4994cd812ab6ad048d5f4e678356002ecac84f79", + "version-string": "7.74.0", + "port-version": 5 + }, { "git-tree": "7772920c05f826f17558333205707dfac104333d", "version-string": "7.74.0", From 9796701f348b4e3fa6ca9891be53110d60bf0f4c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 22 Feb 2021 10:06:52 -0300 Subject: [PATCH 38/68] Bump AWS SDK C++ version --- ports/aws-sdk-cpp/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 5aac8ad5749c2d..02bb0315aa911b 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": [ From 4bc50aadd09404e432a172f6c03cc2bf3b690ed0 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 22 Feb 2021 10:09:52 -0300 Subject: [PATCH 39/68] Bump AWS SDK C++ version --- versions/a-/aws-sdk-cpp.json | 2 +- versions/baseline.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index bf3ec2ed1a869c..692a513817db3a 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -6,7 +6,7 @@ "port-version": 7 }, { - "git-tree": "f1baa5b35e752a0576d9d81d70d15b2c44a467db", + "git-tree": "431ece7f4a65672ad4eb0d8ff43ba9b1ea46d4d1", "version": "1.8.126", "port-version": 8 }, diff --git a/versions/baseline.json b/versions/baseline.json index e6c05d713f35b2..c396c88bbd27b6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -234,7 +234,7 @@ }, "aws-sdk-cpp": { "baseline": "1.8.126", - "port-version": 7 + "port-version": 8 }, "azmq": { "baseline": "2020-03-03", From 9f179c8227e6bcdb046553332dcbd700d361e34a Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 22 Feb 2021 10:26:16 -0300 Subject: [PATCH 40/68] Bump AWS SDK C++ version --- ports/aws-sdk-cpp/vcpkg.in.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json index d0edaef42603b8..5bdb4c44139a5a 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": [ From 77ebcf930cd54baeeed5bac940bcd85603aadcd7 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 22 Feb 2021 10:30:34 -0300 Subject: [PATCH 41/68] Bump AWS SDK C++ version --- versions/a-/aws-sdk-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 692a513817db3a..e52a47cfb8bbe9 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -6,7 +6,7 @@ "port-version": 7 }, { - "git-tree": "431ece7f4a65672ad4eb0d8ff43ba9b1ea46d4d1", + "git-tree": "ab9754f8b78a09407da16cc78674f0857f752658", "version": "1.8.126", "port-version": 8 }, From a556a6349cab5f7eada04bbd080608781f8b51e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 22 Feb 2021 18:37:09 -0800 Subject: [PATCH 42/68] Update ports/curl/CONTROL --- ports/curl/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 48937a3039a0e8..009e54c7882c63 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Port-Version: 5 +Port-Version: 4 Version: 7.74.0 Build-Depends: zlib Homepage: https://github.com/curl/curl @@ -56,4 +56,4 @@ Description: brotli support (brotli) Feature: idn2 Build-Depends: libidn2 -Description: idn2 support (libidn2) \ No newline at end of file +Description: idn2 support (libidn2) From 2862e08ea19ea77bf0c6a45b246e94b2eb25e430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 22 Feb 2021 18:37:15 -0800 Subject: [PATCH 43/68] Update ports/curl/portfile.cmake --- ports/curl/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 4bf49902fd1cea..84b4ac615407d8 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -73,9 +73,9 @@ if(VCPKG_TARGET_IS_ANDROID) endif() vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} ${UWP_OPTIONS} ${ADDITIONAL_SCRIPTS} ${EXTRA_ARGS} From fba2905029b6162e3eb8320ecc6ffad5eca3fa9f Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 22 Feb 2021 18:48:44 -0800 Subject: [PATCH 44/68] update baseline record --- versions/a-/aws-sdk-cpp.json | 8 ++++---- versions/baseline.json | 2 +- versions/c-/curl.json | 7 +------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index e52a47cfb8bbe9..b1faaf479f80db 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,14 +1,14 @@ { "versions": [ { - "git-tree": "7e8485cc7118aff9fe2a437a2015c4575f16bd6f", + "git-tree": "ab9754f8b78a09407da16cc78674f0857f752658", "version": "1.8.126", - "port-version": 7 + "port-version": 8 }, { - "git-tree": "ab9754f8b78a09407da16cc78674f0857f752658", + "git-tree": "f1baa5b35e752a0576d9d81d70d15b2c44a467db", "version": "1.8.126", - "port-version": 8 + "port-version": 7 }, { "git-tree": "011de9c924af9f41faddda1a6bc2bf080eee6679", diff --git a/versions/baseline.json b/versions/baseline.json index b95bfbf6f2af1d..4abe218caeb867 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1514,7 +1514,7 @@ }, "curl": { "baseline": "7.74.0", - "port-version": 5 + "port-version": 4 }, "curlpp": { "baseline": "2018-06-15-3", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 12673d1d388e3c..c466ee6389da92 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,12 +1,7 @@ { "versions": [ { - "git-tree": "4994cd812ab6ad048d5f4e678356002ecac84f79", - "version-string": "7.74.0", - "port-version": 5 - }, - { - "git-tree": "7772920c05f826f17558333205707dfac104333d", + "git-tree": "1ede6cd937655cdf56024869559cadfa99fd0633", "version-string": "7.74.0", "port-version": 4 }, From 2d879c74c472c0dc42a87182f288fe3df1d0e46e Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 23 Feb 2021 09:26:30 -0300 Subject: [PATCH 45/68] Fix Git --- ports/aws-sdk-cpp/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 742707b301d25a..cd474f4903f42b 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -24,9 +24,7 @@ elseif (VCPKG_TARGET_IS_ANDROID) set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" "-DGIT_EXECUTABLE=${GIT}" - - "-DGIT_FOUND=${GIT_FOUND}" - "-DGIT_VERSION_STRING=${GIT_VERSION_STRING}" + "-DGIT_FOUND=TRUE" "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" "-DANDROID_BUILD_ZLIB=FALSE" "-DANDROID_BUILD_CURL=FALSE" From f439a8e96a5e3648adc7205eb102960bc44f4149 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 23 Feb 2021 18:21:56 -0800 Subject: [PATCH 46/68] update version record --- versions/a-/aws-sdk-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index b1faaf479f80db..0098de62e58ab1 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ab9754f8b78a09407da16cc78674f0857f752658", + "git-tree": "6f6d65bb47733ecd73545500ebc19ffbad9ff9d4", "version": "1.8.126", "port-version": 8 }, From b1e1d21cdc330a4ff9d99ee52fd7de835925b707 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sun, 14 Mar 2021 20:56:26 -0300 Subject: [PATCH 47/68] Typo --- scripts/cmake/vcpkg_common_definitions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index b505f3693bb23c..a780593bf42525 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -1,7 +1,7 @@ #[===[.md: # vcpkg_common_definitions -This file defines the following variabls which are commonly needed or used in portfiles: +This file defines the following variables which are commonly needed or used in portfiles: ```cmake VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if From cc88407a24dd8eb35678fb30c08a6011bdb5e6df Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sun, 21 Mar 2021 23:14:26 -0300 Subject: [PATCH 48/68] Fix cross-platform builds of OpenSSL on MinGW/Windows --- ports/openssl/unix/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 14633c9415c956..753534a30c52f1 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -106,7 +106,7 @@ if(BUILD_SHARED_LIBS) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") set(LIB_EXT dylib) set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT}) - elseif(MINGW) + elseif(VCPKG_TARGET_IS_MINGW) string(REPLACE "." "_" SHLIB_VERSION "${SHLIB_VERSION}") set(BIN_EXT dll) set(LIB_EXT dll.a) From 7225fcb7c01045a4c45741663b5885ee60f2cd5b Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sun, 21 Mar 2021 23:22:44 -0300 Subject: [PATCH 49/68] Update version --- versions/o-/openssl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 56c4f2c66b378f..34e80133fe5bbf 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -3,7 +3,7 @@ { "git-tree": "009a7ee95741b939859c77b8e1ddd6c146ffe54e", "version-string": "1.1.1j", - "port-version": 0 + "port-version": 1 }, { "git-tree": "30228fb5d272c8554937ac94b77fb971249c7c8a", From b524c04e618d503288b23f176775511aedf69946 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sun, 21 Mar 2021 23:50:39 -0300 Subject: [PATCH 50/68] Fix version --- versions/o-/openssl.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 34e80133fe5bbf..4d832034f1f205 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,9 +1,14 @@ { "versions": [ + { + "git-tree": "1da146541ad903377643255706cb75a809b74d7f", + "version-string": "1.1.1j", + "port-version": 0 + }, { "git-tree": "009a7ee95741b939859c77b8e1ddd6c146ffe54e", "version-string": "1.1.1j", - "port-version": 1 + "port-version": 0 }, { "git-tree": "30228fb5d272c8554937ac94b77fb971249c7c8a", From 1613218e0adeaef47ba982af7542cf04ecd23ac7 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 21 Mar 2021 19:58:45 -0700 Subject: [PATCH 51/68] update doc --- docs/maintainers/vcpkg_common_definitions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md index a97723c1b0627d..23ea7d48bdb91e 100644 --- a/docs/maintainers/vcpkg_common_definitions.md +++ b/docs/maintainers/vcpkg_common_definitions.md @@ -2,7 +2,7 @@ The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_common_definitions.md). -This file defines the following variabls which are commonly needed or used in portfiles: +This file defines the following variables which are commonly needed or used in portfiles: ```cmake VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if From 3ae30ad483528a01f68ee24cd51b6cbf3d404322 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 2 Apr 2021 18:38:26 -0300 Subject: [PATCH 52/68] Update ports/aws-sdk-cpp/portfile.cmake Co-authored-by: Robert Schumacher --- ports/aws-sdk-cpp/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index cd474f4903f42b..7b915c9499ab3d 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -17,6 +17,7 @@ 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) From c709948c7cf37a96f0e8206ee59ea86ee8d33ae5 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 2 Apr 2021 23:03:34 -0300 Subject: [PATCH 53/68] Update ports/aws-sdk-cpp/portfile.cmake Co-authored-by: Robert Schumacher --- ports/aws-sdk-cpp/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 7b915c9499ab3d..e2edfda14041a3 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -21,10 +21,8 @@ set(EXTRA_ARGS) if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(rpath "@loader_path") elseif (VCPKG_TARGET_IS_ANDROID) - vcpkg_find_acquire_program(GIT) - set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" - "-DGIT_EXECUTABLE=${GIT}" + "-DGIT_EXECUTABLE=--invalid-git-executable--" "-DGIT_FOUND=TRUE" "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" "-DANDROID_BUILD_ZLIB=FALSE" From 345f5f8befbe5f040bb3018057c09479905b4cf5 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sat, 3 Apr 2021 09:38:29 -0300 Subject: [PATCH 54/68] Add debug libraries to curl for Android Simplify OpenSSL patch for curl Update OpenSSL's port version --- ports/curl/0009_fix_openssl_config.patch | 40 +++++++----------------- ports/curl/portfile.cmake | 16 ++++++++-- ports/openssl/CONTROL | 1 + 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/ports/curl/0009_fix_openssl_config.patch b/ports/curl/0009_fix_openssl_config.patch index b4104665928953..c26ee2f45dcc2b 100644 --- a/ports/curl/0009_fix_openssl_config.patch +++ b/ports/curl/0009_fix_openssl_config.patch @@ -1,13 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt (revision e052859759b34d0e05ce0f17244873e5cd7b457b) -+++ b/CMakeLists.txt (date 1613423958921) -@@ -383,20 +383,30 @@ ++++ b/CMakeLists.txt (date 1617452756163) +@@ -383,14 +383,23 @@ endif() if(CMAKE_USE_OPENSSL) - find_package(OpenSSL REQUIRED) -- set(SSL_ENABLED ON) -- set(USE_OPENSSL ON) + if(ANDROID) + message(WARNING "pkg-config not found, setting paths manually!" ) + @@ -17,29 +15,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + include_directories("${OPENSSL_INCLUDE}") + else() + find_package(OpenSSL REQUIRED) ++ endif() + set(SSL_ENABLED ON) + set(USE_OPENSSL ON) -- # Depend on OpenSSL via imported targets if supported by the running -- # version of CMake. This allows our dependents to get our dependencies -- # transitively. + # Depend on OpenSSL via imported targets if supported by the running + # version of CMake. This allows our dependents to get our dependencies + # transitively. - if(NOT CMAKE_VERSION VERSION_LESS 3.4) -- list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto) -- else() -- list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) -- include_directories(${OPENSSL_INCLUDE_DIR}) -+ # Depend on OpenSSL via imported targets if supported by the running -+ # version of CMake. This allows our dependents to get our dependencies -+ # transitively. -+ if(NOT CMAKE_VERSION VERSION_LESS 3.4) -+ list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto) -+ else() -+ list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) -+ include_directories(${OPENSSL_INCLUDE_DIR}) -+ endif() - endif() - -+ set(SSL_ENABLED ON) -+ set(USE_OPENSSL ON) -+ - set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - check_include_file("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H) - check_include_file("openssl/err.h" HAVE_OPENSSL_ERR_H) ++ if(NOT CMAKE_VERSION VERSION_LESS 3.4 AND NOT ANDROID) + list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto) + else() + list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 84b4ac615407d8..3f08ef4d40bed5 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -66,9 +66,17 @@ endif() if(VCPKG_TARGET_IS_ANDROID) set(ADDITIONAL_SCRIPTS -C "${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake") - set(EXTRA_ARGS -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libssl.so" + + set(EXTRA_ARGS -DOPENSSL_INCLUDE="${CURRENT_INSTALLED_DIR}/include") + + set(EXTRA_ARGS_DEBUG + -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/debug/lib/libssl.so" + -DCRYPT_LIBRARY="${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.so" + ) + + set(EXTRA_ARGS_RELEASE + -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libssl.so" -DCRYPT_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libcrypto.so" - -DOPENSSL_INCLUDE="${CURRENT_INSTALLED_DIR}/include" ) endif() @@ -86,6 +94,10 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON -DENABLE_DEBUG=ON -DCURL_CA_FALLBACK=ON + OPTIONS_DEBUG + ${EXTRA_ARGS_DEBUG} + OPTIONS_RELEASE + ${EXTRA_ARGS_RELEASE} ) vcpkg_install_cmake() diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index df1c9ced410529..8a26fb7946cdb4 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,4 +1,5 @@ Source: openssl Version: 1.1.1j +Port-Version: 1 Homepage: https://www.openssl.org Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. From eee6866c5197cd0b6e48ff025ab0a0f36a8e80a8 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sat, 3 Apr 2021 09:43:59 -0300 Subject: [PATCH 55/68] Update aws-sdk-cpp, curl, and OpenSSL versions --- versions/a-/aws-sdk-cpp.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 0098de62e58ab1..87305608de2111 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6f6d65bb47733ecd73545500ebc19ffbad9ff9d4", + "git-tree": "e1cf5cdb2c16125d532b8281d6901839f11a25f5", "version": "1.8.126", "port-version": 8 }, diff --git a/versions/baseline.json b/versions/baseline.json index 1ae024c58edb33..7a348cc65d60ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4490,7 +4490,7 @@ }, "openssl": { "baseline": "1.1.1j", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index c466ee6389da92..30afe3f6b43d92 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1ede6cd937655cdf56024869559cadfa99fd0633", + "git-tree": "76b3a9c5f14ee6378d98ca4d792a77c5b9b750c6", "version-string": "7.74.0", "port-version": 4 }, diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 4d832034f1f205..531412ffde056f 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2695b5d292f012836d962b22293d4dc081f75bff", + "version-string": "1.1.1j", + "port-version": 1 + }, { "git-tree": "1da146541ad903377643255706cb75a809b74d7f", "version-string": "1.1.1j", From 793d48f0afc2511e0b742f232af548e5081aec3c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Thu, 8 Apr 2021 05:34:22 -0300 Subject: [PATCH 56/68] Fix libssh after latest update --- ports/libssh/0002-mingw_for_Android.patch | 17 +++++++++++++++++ ports/libssh/portfile.cmake | 1 + 2 files changed, 18 insertions(+) create mode 100644 ports/libssh/0002-mingw_for_Android.patch diff --git a/ports/libssh/0002-mingw_for_Android.patch b/ports/libssh/0002-mingw_for_Android.patch new file mode 100644 index 00000000000000..a457c06d65ae67 --- /dev/null +++ b/ports/libssh/0002-mingw_for_Android.patch @@ -0,0 +1,17 @@ +Index: src/CMakeLists.txt +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +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/portfile.cmake b/ports/libssh/portfile.cmake index a35ee116269a2e..8acbae1d86275e 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 From 9517f151490466b90c69e4e885553bb55683d916 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Thu, 8 Apr 2021 10:51:52 -0300 Subject: [PATCH 57/68] Update libssh version --- ports/libssh/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libssh/CONTROL b/ports/libssh/CONTROL index 0a138fcd92441e..975903356f7372 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 From 2841f8d7080a235705b2532e1a654681eece748a Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Thu, 8 Apr 2021 10:52:37 -0300 Subject: [PATCH 58/68] Update libssh version --- versions/baseline.json | 10 +++++----- versions/l-/libssh.json | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index a5954fcf82a064..f0d52c4346906f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -332,14 +332,14 @@ "baseline": "4.8.30", "port-version": 5 }, - "bext-ut": { - "baseline": "1.1.8", - "port-version": 0 - }, "bext-di": { "baseline": "1.2.0", "port-version": 0 }, + "bext-ut": { + "baseline": "1.1.8", + "port-version": 0 + }, "bfgroup-lyra": { "baseline": "1.5", "port-version": 1 @@ -3490,7 +3490,7 @@ }, "libssh": { "baseline": "0.9.5", - "port-version": 2 + "port-version": 3 }, "libssh2": { "baseline": "1.9.0", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index a28238b243a243..c142006ccf1b53 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a32bceb0a8e97bc268999dcaa157c0602619026", + "version-string": "0.9.5", + "port-version": 3 + }, { "git-tree": "a9b49412296a9eec38c564afa33555a92898a11f", "version-string": "0.9.5", From 974dc3ba5678a563ef200a974f5558245ab3cfd1 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 13 Apr 2021 19:58:50 -0300 Subject: [PATCH 59/68] Update ports/libssh/portfile.cmake Co-authored-by: nicole mazzuca --- ports/libssh/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index 8acbae1d86275e..8af6daeda5fe26 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_git( SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18 PATCHES 0001-export-pkgconfig-file.patch - 0002-mingw_for_Android.patch + 0002-mingw_for_Android.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS From 81979a35fe52760194c81f3b052e9d1ec6e418bf Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 13 Apr 2021 20:20:08 -0300 Subject: [PATCH 60/68] Update ports/curl/portfile.cmake Co-authored-by: nicole mazzuca --- ports/curl/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 3f08ef4d40bed5..be66d452bea6d7 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -65,7 +65,7 @@ if(VCPKG_TARGET_IS_UWP) endif() if(VCPKG_TARGET_IS_ANDROID) - set(ADDITIONAL_SCRIPTS -C "${CURRENT_PORT_DIR}/CurlAndroidCrossCompile.cmake") + set(ADDITIONAL_SCRIPTS -C "${CMAKE_CURRENT_LIST_DIR}/CurlAndroidCrossCompile.cmake") set(EXTRA_ARGS -DOPENSSL_INCLUDE="${CURRENT_INSTALLED_DIR}/include") From d9f1f2628cacf72230ed69e260bffda93dde3ced Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 13 Apr 2021 16:44:01 -0700 Subject: [PATCH 61/68] Update ports/libssh/portfile.cmake --- ports/libssh/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index 8af6daeda5fe26..cbacd542b3a125 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_git( SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18 PATCHES 0001-export-pkgconfig-file.patch - 0002-mingw_for_Android.patch + 0002-mingw_for_Android.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS From d1b0d34b428ba60c1fe7d4e2cce60c5639e8e990 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 13 Apr 2021 16:48:23 -0700 Subject: [PATCH 62/68] Apply suggestions from code review --- ports/curl/0009_fix_openssl_config.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/curl/0009_fix_openssl_config.patch b/ports/curl/0009_fix_openssl_config.patch index c26ee2f45dcc2b..ac83549505a597 100644 --- a/ports/curl/0009_fix_openssl_config.patch +++ b/ports/curl/0009_fix_openssl_config.patch @@ -1,17 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt (revision e052859759b34d0e05ce0f17244873e5cd7b457b) +++ b/CMakeLists.txt (date 1617452756163) -@@ -383,14 +383,23 @@ +@@ -383,14 +383,21 @@ endif() if(CMAKE_USE_OPENSSL) - find_package(OpenSSL REQUIRED) + if(ANDROID) -+ message(WARNING "pkg-config not found, setting paths manually!" ) ++ message(WARNING "Setting paths manually (instead of using pkg-config) since this is an android build" ) + + list(APPEND CURL_LIBS ${OPENSSL_LIBRARY} ${CRYPT_LIBRARY}) -+ message(STATUS ${CURL_LIBS}) -+ message(STATUS ${OPENSSL_INCLUDE}) + include_directories("${OPENSSL_INCLUDE}") + else() + find_package(OpenSSL REQUIRED) From 9df34f100c11f6232cc4b4f4bb77f4270c5cb7d0 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 13 Apr 2021 22:45:11 -0300 Subject: [PATCH 63/68] Use correct variables for OpenSSL libraries when building curl for Android Fix zlib building for Android Remove redundant patch comments --- ports/curl/0009_fix_openssl_config.patch | 2 +- ports/libssh/0002-mingw_for_Android.patch | 5 ----- ports/zlib/0002-android-build-mingw.patch | 21 +++++++++++++++++++++ ports/zlib/portfile.cmake | 1 + 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 ports/zlib/0002-android-build-mingw.patch diff --git a/ports/curl/0009_fix_openssl_config.patch b/ports/curl/0009_fix_openssl_config.patch index ac83549505a597..45334a34d07f02 100644 --- a/ports/curl/0009_fix_openssl_config.patch +++ b/ports/curl/0009_fix_openssl_config.patch @@ -9,7 +9,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + if(ANDROID) + message(WARNING "Setting paths manually (instead of using pkg-config) since this is an android build" ) + -+ list(APPEND CURL_LIBS ${OPENSSL_LIBRARY} ${CRYPT_LIBRARY}) ++ set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARY} ${CRYPT_LIBRARY}) + include_directories("${OPENSSL_INCLUDE}") + else() + find_package(OpenSSL REQUIRED) diff --git a/ports/libssh/0002-mingw_for_Android.patch b/ports/libssh/0002-mingw_for_Android.patch index a457c06d65ae67..e0e3472b11fcff 100644 --- a/ports/libssh/0002-mingw_for_Android.patch +++ b/ports/libssh/0002-mingw_for_Android.patch @@ -1,8 +1,3 @@ -Index: src/CMakeLists.txt -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt (revision 0cceefd49d4d397eb21bd36e314ac87739da51ff) +++ b/src/CMakeLists.txt (date 1617870624653) diff --git a/ports/zlib/0002-android-build-mingw.patch b/ports/zlib/0002-android-build-mingw.patch new file mode 100644 index 00000000000000..188499df0b758b --- /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/portfile.cmake b/ports/zlib/portfile.cmake index 0d63291a28ec33..429d85440d3eeb 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 From 75de9a94859faca5b24cc16204f1bb1d63778fb5 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 13 Apr 2021 22:47:09 -0300 Subject: [PATCH 64/68] Bump zlib's port version --- ports/zlib/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL index 9a79b2e7b0b18e..a4c1a55d693248 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 From b3312420c4451d017dcbd287ea0130023a1ea06c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 13 Apr 2021 22:51:27 -0300 Subject: [PATCH 65/68] Update zlib, libssh, and curl versions --- versions/baseline.json | 2 +- versions/c-/curl.json | 2 +- versions/l-/libssh.json | 2 +- versions/z-/zlib.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index a0f716cced94cb..b0a43f66317e69 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6578,7 +6578,7 @@ }, "zlib": { "baseline": "1.2.11", - "port-version": 9 + "port-version": 10 }, "zookeeper": { "baseline": "3.5.5-1", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 30afe3f6b43d92..aad7a5216eac9a 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "76b3a9c5f14ee6378d98ca4d792a77c5b9b750c6", + "git-tree": "883db9cb07e4982bf1bf327d5b3fa5a88b6304d8", "version-string": "7.74.0", "port-version": 4 }, diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index c142006ccf1b53..c2146a81ff732d 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9a32bceb0a8e97bc268999dcaa157c0602619026", + "git-tree": "7436981a351a747649d03c4a27a06dc0bc3a0d16", "version-string": "0.9.5", "port-version": 3 }, diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index 006dd7c417dfa7..8b80a1711ac57d 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53a4615c8bb9b98a3864b834a6bbe51cc6c849ef", + "version-string": "1.2.11", + "port-version": 10 + }, { "git-tree": "827111046e37c98153d9d82bb6fa4183b6d728e4", "version-string": "1.2.11", From 1d90b57d76495205fb5f0433d1d1ea7dbe4b4e23 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 13 Apr 2021 21:01:22 -0700 Subject: [PATCH 66/68] [vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path --- ports/popsift/CONTROL | 11 ----------- ports/popsift/portfile.cmake | 2 +- ports/popsift/vcpkg.json | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 ports/popsift/CONTROL create mode 100644 ports/popsift/vcpkg.json diff --git a/ports/popsift/CONTROL b/ports/popsift/CONTROL deleted file mode 100644 index 038e8fb7edf0d3..00000000000000 --- a/ports/popsift/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -Source: popsift -Version: 0.9 -Port-Version: 0 -Description: PopSift is an implementation of the SIFT algorithm in CUDA. -Build-Depends: cuda -Homepage: https://github.com/alicevision/popsift -Supports: !(uwp|arm|arm64|android|x86) - -Feature: apps -Description: Application programs for popsift (detection and matching) -Build-Depends: boost-algorithm, boost-program-options, boost-filesystem, boost-system \ No newline at end of file diff --git a/ports/popsift/portfile.cmake b/ports/popsift/portfile.cmake index f611efa0f1780c..097ef508503aa5 100644 --- a/ports/popsift/portfile.cmake +++ b/ports/popsift/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF develop ) -include(${CURRENT_INSTALLED_DIR}/share/vcpkg_find_cuda/vcpkg_find_cuda.cmake) +include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") diff --git a/ports/popsift/vcpkg.json b/ports/popsift/vcpkg.json new file mode 100644 index 00000000000000..a1d70851454671 --- /dev/null +++ b/ports/popsift/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "popsift", + "version-string": "0.9", + "port-version": 1, + "description": "PopSift is an implementation of the SIFT algorithm in CUDA.", + "homepage": "https://github.com/alicevision/popsift", + "supports": "!(uwp | arm | arm64 | android | x86)", + "dependencies": [ + "cuda" + ], + "features": { + "apps": { + "description": "Application programs for popsift (detection and matching)", + "dependencies": [ + "boost-algorithm", + "boost-filesystem", + "boost-program-options", + "boost-system" + ] + } + } +} From 92523c008895449da63f3bd92ce14317bda78643 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 13 Apr 2021 21:02:33 -0700 Subject: [PATCH 67/68] update version record --- versions/baseline.json | 2 +- versions/p-/popsift.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 8ec59ecb7fabce..1505f651b59c45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4830,7 +4830,7 @@ }, "popsift": { "baseline": "0.9", - "port-version": 0 + "port-version": 1 }, "portable-snippets": { "baseline": "2019-09-20", diff --git a/versions/p-/popsift.json b/versions/p-/popsift.json index cf040e4c3b211a..f5e2bed837bcb9 100644 --- a/versions/p-/popsift.json +++ b/versions/p-/popsift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49604b01944c87f8f02ca1fec85a243398d66d5d", + "version-string": "0.9", + "port-version": 1 + }, { "git-tree": "807871ff30d3f2e5f40fbe3ff72dde0254b30c8d", "version-string": "0.9", From c9554a2d841f1558283fd11bfc5de76938bc8949 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Wed, 14 Apr 2021 23:30:54 -0300 Subject: [PATCH 68/68] Update versions/o-/openssl.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- versions/o-/openssl.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 531412ffde056f..9891f69cd97b59 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -5,11 +5,6 @@ "version-string": "1.1.1j", "port-version": 1 }, - { - "git-tree": "1da146541ad903377643255706cb75a809b74d7f", - "version-string": "1.1.1j", - "port-version": 0 - }, { "git-tree": "009a7ee95741b939859c77b8e1ddd6c146ffe54e", "version-string": "1.1.1j",