From 3107c9882ce2d217bb95d3aab0eb89c1c6ab810a Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Wed, 9 Oct 2024 20:35:13 +0000 Subject: [PATCH 1/5] add a symlink to point s2n/unstable/cleanup.h to api/unstable/cleanup.h --- aws-common-runtime/config/s2n | 1 + 1 file changed, 1 insertion(+) create mode 120000 aws-common-runtime/config/s2n diff --git a/aws-common-runtime/config/s2n b/aws-common-runtime/config/s2n new file mode 120000 index 00000000..6fc5df94 --- /dev/null +++ b/aws-common-runtime/config/s2n @@ -0,0 +1 @@ +../s2n/api \ No newline at end of file From 19eaa61147e9bc8ec58769d687d0547ad4519132 Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 11:02:37 -0700 Subject: [PATCH 2/5] submodule updates --- aws-common-runtime/aws-c-auth | 2 +- aws-common-runtime/aws-c-http | 2 +- aws-common-runtime/aws-c-io | 2 +- aws-common-runtime/aws-checksums | 2 +- aws-common-runtime/s2n | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth index d5e6eb03..48d647bf 160000 --- a/aws-common-runtime/aws-c-auth +++ b/aws-common-runtime/aws-c-auth @@ -1 +1 @@ -Subproject commit d5e6eb03b5dc36845cc44995c6afbbce19a287af +Subproject commit 48d647bf43f8872e4dc5ec6343b0c5974195fbdd diff --git a/aws-common-runtime/aws-c-http b/aws-common-runtime/aws-c-http index 4b1634be..6068653e 160000 --- a/aws-common-runtime/aws-c-http +++ b/aws-common-runtime/aws-c-http @@ -1 +1 @@ -Subproject commit 4b1634be75f1a0f63d494ae91a437729750ce269 +Subproject commit 6068653e1d582bd8e7d1c9f81f86beaf10444e3d diff --git a/aws-common-runtime/aws-c-io b/aws-common-runtime/aws-c-io index c345d772..dc41ddc4 160000 --- a/aws-common-runtime/aws-c-io +++ b/aws-common-runtime/aws-c-io @@ -1 +1 @@ -Subproject commit c345d77274db83c0c2e30331814093e7c84c45e2 +Subproject commit dc41ddc498c10ebbf69aba7775afa36c8c1910bd diff --git a/aws-common-runtime/aws-checksums b/aws-common-runtime/aws-checksums index 779b5f35..ce04ab00 160000 --- a/aws-common-runtime/aws-checksums +++ b/aws-common-runtime/aws-checksums @@ -1 +1 @@ -Subproject commit 779b5f350eed7fb784bb3c6700b7532e3fdd84ff +Subproject commit ce04ab00b3ecc41912f478bfedca39f8e1919d6b diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n index 08d413a0..ffe0bf42 160000 --- a/aws-common-runtime/s2n +++ b/aws-common-runtime/s2n @@ -1 +1 @@ -Subproject commit 08d413a0b9b3226e775a38f04e3cf02230cc97c4 +Subproject commit ffe0bf42da8f139eff8fd2237f47fbde40b478fb From e4b3ec639c7e539dae6239344d8b80cdefda9313 Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 11:17:31 -0700 Subject: [PATCH 3/5] use the AWS_S2N_INSOURCE_PATH instead --- Package.swift | 1 + aws-common-runtime/config/s2n | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 aws-common-runtime/config/s2n diff --git a/Package.swift b/Package.swift index 1aac45ce..4d166f6c 100644 --- a/Package.swift +++ b/Package.swift @@ -117,6 +117,7 @@ var cSettingsIO = cSettings #if os(Linux) ioDependencies.append("S2N_TLS") cSettingsIO.append(.define("USE_S2N")) +cSettingsIO.append(.define("AWS_S2N_INSOURCE_PATH")) #endif #if os(Windows) diff --git a/aws-common-runtime/config/s2n b/aws-common-runtime/config/s2n deleted file mode 120000 index 6fc5df94..00000000 --- a/aws-common-runtime/config/s2n +++ /dev/null @@ -1 +0,0 @@ -../s2n/api \ No newline at end of file From f8ef129ff5712cd89fbf2c5fc0cf87e2cbe7a6fe Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 14:36:01 -0700 Subject: [PATCH 4/5] Revert "use the AWS_S2N_INSOURCE_PATH instead" This reverts commit e4b3ec639c7e539dae6239344d8b80cdefda9313. --- Package.swift | 1 - aws-common-runtime/config/s2n | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 120000 aws-common-runtime/config/s2n diff --git a/Package.swift b/Package.swift index 4d166f6c..1aac45ce 100644 --- a/Package.swift +++ b/Package.swift @@ -117,7 +117,6 @@ var cSettingsIO = cSettings #if os(Linux) ioDependencies.append("S2N_TLS") cSettingsIO.append(.define("USE_S2N")) -cSettingsIO.append(.define("AWS_S2N_INSOURCE_PATH")) #endif #if os(Windows) diff --git a/aws-common-runtime/config/s2n b/aws-common-runtime/config/s2n new file mode 120000 index 00000000..6fc5df94 --- /dev/null +++ b/aws-common-runtime/config/s2n @@ -0,0 +1 @@ +../s2n/api \ No newline at end of file From 36ecee1917c251b2f82b24a2603a3a7a7c5dea47 Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 14:39:11 -0700 Subject: [PATCH 5/5] add readme --- aws-common-runtime/config/README | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 aws-common-runtime/config/README diff --git a/aws-common-runtime/config/README b/aws-common-runtime/config/README new file mode 100644 index 00000000..8edb2c0c --- /dev/null +++ b/aws-common-runtime/config/README @@ -0,0 +1,5 @@ +Helpers for swift to build the aws-common-runtime packages + +It contains: +* a symlink to point s2n/unstable/cleanup.h to api/unstable/cleanup.h for building s2n with the other aws-common-runtime packages. +* `aws/common/config.h`, because cmake will run for swift build. Set the config.h separately.