From 91c7837d314266d097f0be89e7e3a84571f31821 Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Fri, 23 Aug 2024 04:02:58 +0000 Subject: [PATCH 1/5] Update required CMake --- CMakeLists.txt | 7 ++----- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-event-stream | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-c-s3 | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-checksums | 2 +- 12 files changed, 13 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb54a14e0..bf86c3555 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,4 @@ -cmake_minimum_required(VERSION 3.1) - -if(POLICY CMP0077) - cmake_policy(SET CMP0077 NEW) -endif() +cmake_minimum_required(VERSION 3.13) option(BUILD_DEPS "Builds aws common runtime dependencies as part of build. Turn off if you want to control your dependency chain." ON) option(BYO_CRYPTO "Don't build a tls implementation or link against a crypto interface. This feature is only for unix builds currently" OFF) @@ -283,6 +279,7 @@ endif() set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDARD}) +set_target_properties(${PROJECT_NAME} PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN ON) aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_CRT_CPP") diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 52bf59161..084868560 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 52bf591613d1a001c43ec99af7376f871759c5fe +Subproject commit 084868560e6856943a5b906916ab4957e7c61b70 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 77ca3aea8..0627591cf 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 77ca3aea879bc768082fe7ec715adcde8e98c332 +Subproject commit 0627591cf9fc587bd357fea0b34f984dc3609a11 diff --git a/crt/aws-c-common b/crt/aws-c-common index 672cc0032..484fddaf0 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 672cc0032eb28d69fbdd22c9463253c89d7a6f30 +Subproject commit 484fddaf09b65e97b6577c020a131e9f5bdb1106 diff --git a/crt/aws-c-compression b/crt/aws-c-compression index ea1d421a4..ff2120184 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit ea1d421a421ad83a540309a94c38d50b6a5d836b +Subproject commit ff21201842dee4a30563c424f5f753bbef3f648e diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream index 1b3825fc9..305f71f94 160000 --- a/crt/aws-c-event-stream +++ b/crt/aws-c-event-stream @@ -1 +1 @@ -Subproject commit 1b3825fc9cae2e9c7ed7479ee5d354d52ebdf7a0 +Subproject commit 305f71f94ac401a51c53ddcd05c454472e7f18ab diff --git a/crt/aws-c-http b/crt/aws-c-http index 4e74ab1e3..3225effef 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 4e74ab1e3702763e0b87bd1752f5a37c2f0400ac +Subproject commit 3225effefb4d6ae99e7f5edd51a55df6fc5d83fa diff --git a/crt/aws-c-io b/crt/aws-c-io index c345d7727..1e29ae8aa 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit c345d77274db83c0c2e30331814093e7c84c45e2 +Subproject commit 1e29ae8aa63847220c339a7ee9903685eca7134b diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index ed7bbd68c..5edf91839 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit ed7bbd68c03d7022c915a2924740ab7992ad2311 +Subproject commit 5edf91839929ed4059bc3ecc340d344c8e17f5ca diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index 0ab4d58ef..5453f6bbd 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit 0ab4d58ef0bd97970d43828cb6b57a3de5747343 +Subproject commit 5453f6bbd424f0924d5df97fdf233f40c10b321e diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index 4658412a6..f3f6cd10e 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 4658412a61ad5749db92a8d1e0717cb5e76ada1c +Subproject commit f3f6cd10e0f8352640f557174a5ef3c62d5f6147 diff --git a/crt/aws-checksums b/crt/aws-checksums index aac442a2d..53c112b63 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit aac442a2dbbb5e72d0a3eca8313cf65e7e1cac2f +Subproject commit 53c112b6315ef600a4604d4f1f9b673beb4ec8b0 From 32e795685653f8f2fd75fd5fe2d9e8757d7521c0 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 15:51:07 -0700 Subject: [PATCH 2/5] aws prebuild --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69e534a1c..37174eb23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ if(BUILD_DEPS) endif() # s2n-tls uses libcrypto during its configuration, so we need to prebuild aws-lc. - prebuild_dependency( + aws_prebuild_dependency( DEPENDENCY_NAME AWSLC SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/aws-lc CMAKE_ARGUMENTS From 3484a6cbd495aca2bf34ffd4a365c03a656a3d16 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Fri, 18 Oct 2024 10:46:45 -0700 Subject: [PATCH 3/5] 39 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37174eb23..1adc5da50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.9) option(BUILD_DEPS "Builds aws common runtime dependencies as part of build. Turn off if you want to control your dependency chain." ON) option(BYO_CRYPTO "Don't build a tls implementation or link against a crypto interface. This feature is only for unix builds currently" OFF) From ea5010113493862ddfc22ef0c786fc7e87d56d64 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Fri, 18 Oct 2024 10:48:34 -0700 Subject: [PATCH 4/5] revert policy --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1adc5da50..c97189be6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 3.9) +if(POLICY CMP0077) + cmake_policy(SET CMP0077 NEW) +endif() + option(BUILD_DEPS "Builds aws common runtime dependencies as part of build. Turn off if you want to control your dependency chain." ON) option(BYO_CRYPTO "Don't build a tls implementation or link against a crypto interface. This feature is only for unix builds currently" OFF) option(USE_OPENSSL "Set this if you want to use your system's OpenSSL 1.0.2/1.1.1 compatible libcrypto" OFF) From 15069b8627f566a9f7d6889fb674bb843a0b156f Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 23 Oct 2024 10:06:23 -0700 Subject: [PATCH 5/5] latest submodules --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-event-stream | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-c-s3 | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-checksums | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 08fb6f71a..3982bd75f 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 08fb6f71a85f8c9522547af164d497c8fec4f2aa +Subproject commit 3982bd75fea74efd8f9b462b27fedd4599db4f53 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index fdaef2ddf..656762aef 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit fdaef2ddfb4cd5850231d9bd9d6e34e91b41c943 +Subproject commit 656762aefbee2bc8f509cb23cd107abff20a72bb diff --git a/crt/aws-c-common b/crt/aws-c-common index d223f6009..f41b772f0 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit d223f6009ce979637d3c9e7d2f5f02af08497cc0 +Subproject commit f41b772f0de9454a4e7a65750b58c2379533bbf1 diff --git a/crt/aws-c-compression b/crt/aws-c-compression index ff2120184..c6c1191e5 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit ff21201842dee4a30563c424f5f753bbef3f648e +Subproject commit c6c1191e525e5aa6ead9e1afc392e35d3b50331e diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream index 305f71f94..d2dcc9344 160000 --- a/crt/aws-c-event-stream +++ b/crt/aws-c-event-stream @@ -1 +1 @@ -Subproject commit 305f71f94ac401a51c53ddcd05c454472e7f18ab +Subproject commit d2dcc9344dae24de320866045d85166d8a91a0d1 diff --git a/crt/aws-c-http b/crt/aws-c-http index 7778cd991..74b3a0dd1 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 7778cd99166087af36b3b1cdc687b57192952f0f +Subproject commit 74b3a0dd1396b72f701c8bdf24e5c6f41e52cf87 diff --git a/crt/aws-c-io b/crt/aws-c-io index b4680a684..fe93d0afc 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit b4680a684e46d74fb89c9309cccf0c4b4332189d +Subproject commit fe93d0afcc1cede32ac9569abd8669ed011b1b8c diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index 40d6b2de8..627c3334e 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit 40d6b2de82ef5b2b95992584678279828d2f8af6 +Subproject commit 627c3334e52021aa8d5772b6ca076884610f3219 diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index e77b41178..8c1969bce 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit e77b411787da795510f0aa0877525e544fe6ea57 +Subproject commit 8c1969bce5bfe0e063cbc719182dbe344342b880 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index f3f6cd10e..0818f28ee 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit f3f6cd10e0f8352640f557174a5ef3c62d5f6147 +Subproject commit 0818f28ee436b892f09fbe8e3a6ae37ff40e9436 diff --git a/crt/aws-checksums b/crt/aws-checksums index 38c5d4423..0d2f5521f 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit 38c5d44237413b241ae648e3becd47568e598061 +Subproject commit 0d2f5521f61215f38f791d106ae304402208112d