From 24fbd073b88f129f217d38e0b220dcb1dd4d98ab Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 15 Jan 2021 20:45:21 -0300 Subject: [PATCH 01/14] Fix Mbed TLS build for Android --- ports/mbedtls/portfile.cmake | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 196f7c08bfc395..5ad1f9cbb70a2e 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -3,28 +3,33 @@ vcpkg_fail_port_install(ON_TARGET "uwp") set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ARMmbed/mbedtls - REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0 - SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07 - HEAD_REF master - PATCHES + OUT_SOURCE_PATH SOURCE_PATH + REPO ARMmbed/mbedtls + REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0 + SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07 + HEAD_REF master + PATCHES enable-pthread.patch ) vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - pthreads ENABLE_PTHREAD + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pthreads ENABLE_PTHREAD ) +if (VCPKG_TARGET_IS_ANDROID) + set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE") +endif () + vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF + ${EXTRA_ARGS} ) vcpkg_install_cmake() @@ -33,8 +38,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -if(WIN32 AND pthreads IN_LIST FEATURES) +if (WIN32 AND pthreads IN_LIST FEATURES) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -endif() +endif () vcpkg_copy_pdbs() \ No newline at end of file From 06699066d83bc7232cbc73938237d3c83659a407 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sat, 16 Jan 2021 03:23:58 -0300 Subject: [PATCH 02/14] Fix Mbed TLS build for Android Add better Windows checks --- ports/mbedtls/portfile.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 5ad1f9cbb70a2e..37717ee87329ff 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -19,7 +19,10 @@ vcpkg_check_features( ) if (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE") + set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE" + "-DTARGET_ARCH=ANDROID" + "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" + ) endif () vcpkg_configure_cmake( @@ -38,7 +41,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -if (WIN32 AND pthreads IN_LIST FEATURES) +if (VCPKG_TARGET_IS_WINDOWS AND pthreads IN_LIST FEATURES) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) endif () From 97209fd3e325c9dc40e311f32299d4425f8fd9a6 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 18 Jan 2021 00:16:31 -0300 Subject: [PATCH 03/14] Fix libssh build for Android --- port_versions/baseline.json | 2 +- port_versions/m-/mbedtls.json | 5 +++++ ports/mbedtls/CONTROL | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 250f6157cf862c..21ef774049636b 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3646,7 +3646,7 @@ }, "mbedtls": { "baseline": "2.24.0", - "port-version": 1 + "port-version": 2 }, "mcpp": { "baseline": "2.7.2.14", diff --git a/port_versions/m-/mbedtls.json b/port_versions/m-/mbedtls.json index 4eb92bc5958cdc..4366efcf5816d8 100644 --- a/port_versions/m-/mbedtls.json +++ b/port_versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c903a973a3e00b65d8832096baeddcd985c9354", + "version-string": "2.24.0", + "port-version": 2 + }, { "git-tree": "8b510a700284731a6f552ff2cd874794af4032ff", "version-string": "2.24.0", diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL index 74164ea10f3f18..dc8bded7bbfe11 100644 --- a/ports/mbedtls/CONTROL +++ b/ports/mbedtls/CONTROL @@ -1,6 +1,6 @@ Source: mbedtls Version: 2.24.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/ARMmbed/mbedtls Description: An open source, portable, easy to use, readable and flexible SSL library Supports: !uwp From eeda15ad7d5a7ff12196526329bf07b0604cabef Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 17 Jan 2021 21:46:46 -0800 Subject: [PATCH 04/14] update baseline --- port_versions/m-/mbedtls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/m-/mbedtls.json b/port_versions/m-/mbedtls.json index 4366efcf5816d8..3b32159213e14d 100644 --- a/port_versions/m-/mbedtls.json +++ b/port_versions/m-/mbedtls.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5c903a973a3e00b65d8832096baeddcd985c9354", + "git-tree": "5baf785bf784522fc92a057782f0cb1b646d78bf", "version-string": "2.24.0", "port-version": 2 }, From bde18a83462ea4cf992ccf233c0c1e898431402c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 22:14:11 -0300 Subject: [PATCH 05/14] Remove redundant parameter --- ports/mbedtls/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 37717ee87329ff..3c46d37f8b09c9 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -19,8 +19,7 @@ vcpkg_check_features( ) if (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE" - "-DTARGET_ARCH=ANDROID" + set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ) endif () From 26c4ff6e2f788752ad5092a3a469dee9e2d42385 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 22:14:54 -0300 Subject: [PATCH 06/14] Fix version --- port_versions/m-/mbedtls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/m-/mbedtls.json b/port_versions/m-/mbedtls.json index 4366efcf5816d8..086f04c59541b8 100644 --- a/port_versions/m-/mbedtls.json +++ b/port_versions/m-/mbedtls.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5c903a973a3e00b65d8832096baeddcd985c9354", + "git-tree": "dc864f7d1335b995fa4953b60df63858de4d59a0", "version-string": "2.24.0", "port-version": 2 }, From 9923a3769d36c48bf769778f36ff20cc46d4450e Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 22:16:01 -0300 Subject: [PATCH 07/14] Fix version --- port_versions/m-/mbedtls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/m-/mbedtls.json b/port_versions/m-/mbedtls.json index 3b32159213e14d..086f04c59541b8 100644 --- a/port_versions/m-/mbedtls.json +++ b/port_versions/m-/mbedtls.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5baf785bf784522fc92a057782f0cb1b646d78bf", + "git-tree": "dc864f7d1335b995fa4953b60df63858de4d59a0", "version-string": "2.24.0", "port-version": 2 }, From 6cc7df9807489c135e476a965931c6e081ee61c0 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 22:16:51 -0300 Subject: [PATCH 08/14] Fix paramters --- ports/mbedtls/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 3c46d37f8b09c9..3aba2259cb661e 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_check_features( ) if (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" + set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ) endif () From 7f327c56f96626310263022b004115a48bdb0d8c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 22:17:20 -0300 Subject: [PATCH 09/14] Fix version --- port_versions/m-/mbedtls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/m-/mbedtls.json b/port_versions/m-/mbedtls.json index 086f04c59541b8..02ebe8f3d191f2 100644 --- a/port_versions/m-/mbedtls.json +++ b/port_versions/m-/mbedtls.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dc864f7d1335b995fa4953b60df63858de4d59a0", + "git-tree": "032fa9018e819f469d854a849622b46ffbda8edc", "version-string": "2.24.0", "port-version": 2 }, From 0a8f16c6bd89bbd5c173827b545d6fc8fcb7e93c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 23:13:23 -0300 Subject: [PATCH 10/14] Better Android support --- ports/mbedtls/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 3aba2259cb661e..f3155f4e50cf18 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -19,9 +19,7 @@ vcpkg_check_features( ) if (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE" - "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" - ) + set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE") endif () vcpkg_configure_cmake( From a93e67f3fd37292ca6fd98de2f84c0db49230185 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Tue, 19 Jan 2021 23:14:22 -0300 Subject: [PATCH 11/14] Fix version --- port_versions/m-/mbedtls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/m-/mbedtls.json b/port_versions/m-/mbedtls.json index 02ebe8f3d191f2..5710a4d54fa228 100644 --- a/port_versions/m-/mbedtls.json +++ b/port_versions/m-/mbedtls.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "032fa9018e819f469d854a849622b46ffbda8edc", + "git-tree": "d2e685aafca44225d3583d0de7ff4add4de523ad", "version-string": "2.24.0", "port-version": 2 }, From 3f7535d78b0a357fc50a519b3547fc220238c756 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Thu, 21 Jan 2021 00:09:49 -0300 Subject: [PATCH 12/14] Disable warnings as errors for Mbed TLS --- ports/mbedtls/portfile.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index f3155f4e50cf18..bd4c38eae898a0 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -18,10 +18,6 @@ vcpkg_check_features( pthreads ENABLE_PTHREAD ) -if (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DMBEDTLS_FATAL_WARNINGS=FALSE") -endif () - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -29,7 +25,7 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF - ${EXTRA_ARGS} + -DMBEDTLS_FATAL_WARNINGS=FALSE ) vcpkg_install_cmake() From d8dfb5d2aa324562db727d96e41723ceb0597f0c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Thu, 21 Jan 2021 00:11:47 -0300 Subject: [PATCH 13/14] Restore formatting --- ports/mbedtls/portfile.cmake | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index bd4c38eae898a0..3bd961fbce827f 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -3,25 +3,25 @@ vcpkg_fail_port_install(ON_TARGET "uwp") set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ARMmbed/mbedtls - REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0 - SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07 - HEAD_REF master - PATCHES + OUT_SOURCE_PATH SOURCE_PATH + REPO ARMmbed/mbedtls + REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0 + SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07 + HEAD_REF master + PATCHES enable-pthread.patch ) vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - pthreads ENABLE_PTHREAD + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pthreads ENABLE_PTHREAD ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF From e51702306f9011d408de5a4eef1802d4ab0d090d Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Thu, 21 Jan 2021 00:27:30 -0300 Subject: [PATCH 14/14] Fix version files --- port_versions/m-/mbedtls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/m-/mbedtls.json b/port_versions/m-/mbedtls.json index 5710a4d54fa228..6498c4d2c107a9 100644 --- a/port_versions/m-/mbedtls.json +++ b/port_versions/m-/mbedtls.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d2e685aafca44225d3583d0de7ff4add4de523ad", + "git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47", "version-string": "2.24.0", "port-version": 2 },