diff options
| author | Stéphan Kochen <git@stephank.nl> | 2020-12-04 19:32:35 +0100 |
|---|---|---|
| committer | Stéphan Kochen <git@stephank.nl> | 2020-12-04 19:36:09 +0100 |
| commit | e20a3ec756c61b076d5fbaea6d976c8ee7fa4c07 (patch) | |
| tree | cbeeb0f103097b6aa226752628e59afbd9a2b1dc | |
| parent | 45645b6f3b6c45f20a7bece6da395c3e095aedd0 (diff) | |
Fix compatibility with newer AWS SDKs
Tested against AWS SDK 1.8.99. Fixes #3201.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/libstore/s3-binary-cache-store.cc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 39306b953..daf378997 100644 --- a/configure.ac +++ b/configure.ac @@ -255,6 +255,7 @@ if test -n "$enable_s3"; then declare -a aws_version_tokens=($(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g' | tr '.' ' ')) AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], ${aws_version_tokens@<:@0@:>@}, [Major version of aws-sdk-cpp.]) AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], ${aws_version_tokens@<:@1@:>@}, [Minor version of aws-sdk-cpp.]) + AC_DEFINE_UNQUOTED([AWS_VERSION_PATCH], ${aws_version_tokens@<:@2@:>@}, [Patch version of aws-sdk-cpp.]) fi diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 4519dd5b5..27253fc12 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -57,6 +57,10 @@ class AwsLogger : public Aws::Utils::Logging::FormattedLogSystem { debug("AWS: %s", chomp(statement)); } + +#if !(AWS_VERSION_MAJOR <= 1 && AWS_VERSION_MINOR <= 7 && AWS_VERSION_PATCH <= 115) + void Flush() override {} +#endif }; static void initAWS() |