From 5047a4545a08db1006d4e8f026ead9a9f7667cb8 Mon Sep 17 00:00:00 2001 From: Alex Chew Date: Fri, 21 Aug 2020 15:11:38 -0700 Subject: [PATCH 1/2] upgrade aws-sdk-cpp (+aws-c-common, transitively) --- README.md | 2 +- codebuild/bin/install-aws-deps.sh | 2 +- codebuild/ubuntu-latest-x64.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4f8e8830b..a3377a6f7 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ Now skip to the "Mac: Build and install the AWS Encryption SDK for C" section be Build and install aws-c-common: - git clone -b v0.3.15 https://github.com/awslabs/aws-c-common.git + git clone -b v0.4.42 https://github.com/awslabs/aws-c-common.git mkdir build-aws-c-common && cd build-aws-c-common cmake -G Xcode -DBUILD_SHARED_LIBS=ON ../aws-c-common xcodebuild -target install ; cd .. diff --git a/codebuild/bin/install-aws-deps.sh b/codebuild/bin/install-aws-deps.sh index 02cd06629..3a02173c8 100755 --- a/codebuild/bin/install-aws-deps.sh +++ b/codebuild/bin/install-aws-deps.sh @@ -62,5 +62,5 @@ for libtype in shared static; do root=/deps/$libtype # not installing aws-c-common anymore because aws-sdk-cpp installs it for us - build_pkg $root/install https://github.com/aws/aws-sdk-cpp.git 1.7.163 $CMAKE_ARGS -DBUILD_ONLY=kms -DENABLE_UNITY_BUILD=ON + build_pkg $root/install https://github.com/aws/aws-sdk-cpp.git 1.8.32 $CMAKE_ARGS -DBUILD_ONLY=kms -DBUILD_DEPS=OFF done diff --git a/codebuild/ubuntu-latest-x64.Dockerfile b/codebuild/ubuntu-latest-x64.Dockerfile index 11da0f18a..d05cab9a0 100644 --- a/codebuild/ubuntu-latest-x64.Dockerfile +++ b/codebuild/ubuntu-latest-x64.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu:latest # Needed for setup-apt-cache.sh -ADD https://mirrors.kernel.org/ubuntu/pool/main/n/net-tools/net-tools_1.60+git20161116.90da8a0-2ubuntu1_amd64.deb /tmp +ADD https://mirrors.kernel.org/ubuntu/pool/main/n/net-tools/net-tools_1.60+git20180626.aebd88e-1ubuntu1_amd64.deb /tmp ADD https://mirrors.kernel.org/ubuntu/pool/universe/n/netcat/netcat-traditional_1.10-40_amd64.deb /tmp RUN dpkg -i /tmp/net-tools_*.deb /tmp/netcat-*.deb From 53ddbfa859914044efbe7becd5995acf97da42e4 Mon Sep 17 00:00:00 2001 From: Alex Chew Date: Wed, 26 Aug 2020 14:13:07 -0700 Subject: [PATCH 2/2] remove -DBUILD_DEPS=OFF from aws-sdk-cpp build --- codebuild/bin/install-aws-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/bin/install-aws-deps.sh b/codebuild/bin/install-aws-deps.sh index 3a02173c8..4d9c5cdb7 100755 --- a/codebuild/bin/install-aws-deps.sh +++ b/codebuild/bin/install-aws-deps.sh @@ -62,5 +62,5 @@ for libtype in shared static; do root=/deps/$libtype # not installing aws-c-common anymore because aws-sdk-cpp installs it for us - build_pkg $root/install https://github.com/aws/aws-sdk-cpp.git 1.8.32 $CMAKE_ARGS -DBUILD_ONLY=kms -DBUILD_DEPS=OFF + build_pkg $root/install https://github.com/aws/aws-sdk-cpp.git 1.8.32 $CMAKE_ARGS -DBUILD_ONLY=kms done