From 95b71d8eb6d567d80dcff6c0d0ccc98d1f643137 Mon Sep 17 00:00:00 2001 From: Bret Ambrose Date: Fri, 11 Mar 2022 11:03:35 -0800 Subject: [PATCH] Submodule work (#36) * Existing submodule sync * Add aws-c-sdkutils * Rust related updates for sdkutils --- .gitmodules | 3 +++ CMakeLists.txt | 2 ++ aws-crt-sys/build.rs | 1 + aws-crt-sys/src/lib.rs | 2 +- cmake/aws-crt-ffi-config.cmake | 1 + crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-sdkutils | 1 + crt/aws-checksums | 2 +- crt/aws-lc | 2 +- crt/s2n | 2 +- 15 files changed, 18 insertions(+), 10 deletions(-) create mode 160000 crt/aws-c-sdkutils diff --git a/.gitmodules b/.gitmodules index e9fa579..0fa47bd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "aws-lc"] path = crt/aws-lc url = https://github.com/awslabs/aws-lc.git +[submodule "crt/aws-c-sdkutils"] + path = crt/aws-c-sdkutils + url = https://github.com/awslabs/aws-c-sdkutils diff --git a/CMakeLists.txt b/CMakeLists.txt index 144871a..5ad1b45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,7 @@ if (UNIX AND NOT APPLE) endif() add_subdirectory(crt/s2n) endif() +add_subdirectory(crt/aws-c-sdkutils) add_subdirectory(crt/aws-c-io) add_subdirectory(crt/aws-c-cal) add_subdirectory(crt/aws-c-compression) @@ -89,6 +90,7 @@ aws_set_common_properties(${PROJECT_NAME}) aws_prepare_shared_lib_exports(${PROJECT_NAME}) aws_use_package(aws-c-common) +aws_use_package(aws-c-sdkutils) aws_use_package(aws-c-io) aws_use_package(aws-c-cal) aws_use_package(aws-c-compression) diff --git a/aws-crt-sys/build.rs b/aws-crt-sys/build.rs index 036cec2..5d0cc41 100644 --- a/aws-crt-sys/build.rs +++ b/aws-crt-sys/build.rs @@ -79,6 +79,7 @@ fn compile_aws_crt_ffi() { println!("cargo:rustc-link-lib={}", "aws-c-io"); println!("cargo:rustc-link-lib={}", "aws-c-cal"); println!("cargo:rustc-link-lib={}", "aws-checksums"); + println!("cargo:rustc-link-lib={}", "aws-c-sdkutils"); println!("cargo:rustc-link-lib={}", "aws-c-common"); configure_link_for_platform(); } diff --git a/aws-crt-sys/src/lib.rs b/aws-crt-sys/src/lib.rs index bb255f4..5f7d09e 100644 --- a/aws-crt-sys/src/lib.rs +++ b/aws-crt-sys/src/lib.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.59.1 */ +/* automatically generated by rust-bindgen 0.59.2 */ #![allow(dead_code)] #![allow(non_upper_case_globals)] diff --git a/cmake/aws-crt-ffi-config.cmake b/cmake/aws-crt-ffi-config.cmake index 81edc0f..640327d 100644 --- a/cmake/aws-crt-ffi-config.cmake +++ b/cmake/aws-crt-ffi-config.cmake @@ -5,6 +5,7 @@ if (UNIX AND NOT APPLE) endif() find_dependency(aws-c-common) +find_dependency(aws-c-sdkutils) find_dependency(aws-c-cal) find_dependency(aws-c-io) find_dependency(aws-c-http) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 61b6524..e1b95cc 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 61b6524960ad5e0c7aa2e38b343425d5941781bf +Subproject commit e1b95cca6f2248c28b66ddb40bcccd35a59cb8b5 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index aa89aa4..9ab6f96 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit aa89aa4950074babe84762413f39bd364ecaf944 +Subproject commit 9ab6f96e5aba10b2e337c51e62d9400f001cfe0c diff --git a/crt/aws-c-common b/crt/aws-c-common index fdd4a10..d9031cf 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit fdd4a10243903260f412f587cc748f0ac79629b4 +Subproject commit d9031cf4f02fe4d8c24a53bb6c8df67ce8be9f0c diff --git a/crt/aws-c-compression b/crt/aws-c-compression index fc1631e..5fab8bc 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit fc1631ea1ce563b0a453cb7a7233fca949e36970 +Subproject commit 5fab8bc5ab5321d86f6d153b06062419080820ec diff --git a/crt/aws-c-http b/crt/aws-c-http index fa1692a..f686b89 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit fa1692ae103dcc40e3d0a9db1b29acfc204a294e +Subproject commit f686b89d8c3f500387db10a7f1614eadebf0b0ff diff --git a/crt/aws-c-io b/crt/aws-c-io index 14b5e6d..6e695d2 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 14b5e6d73b41eeabf04fc6228276eb1eb59bd99c +Subproject commit 6e695d26115a799a000608167df74a6cd3b0b717 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils new file mode 160000 index 0000000..e3c23f4 --- /dev/null +++ b/crt/aws-c-sdkutils @@ -0,0 +1 @@ +Subproject commit e3c23f4aca31d9e66df25827645f72cbcbfb657a diff --git a/crt/aws-checksums b/crt/aws-checksums index 99bb0ad..41df303 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit 99bb0ad4b89d335d638536694352c45e0d2188f5 +Subproject commit 41df3031b92120b6d8127b7b7122391d5ac6f33f diff --git a/crt/aws-lc b/crt/aws-lc index 8b7d44e..b404987 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 8b7d44e7c7d0822cb52b92bfa5f92619014cbe31 +Subproject commit b40498737348fee436a65e2a4badfb392acca36d diff --git a/crt/s2n b/crt/s2n index b5b313b..65455a2 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit b5b313b9ccddf268b30c642798f1d2a58d49ecd6 +Subproject commit 65455a2c93370b6878ee04efb41c51409cf807db