This is an automated email from the ASF dual-hosted git repository.
phrocker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 6cbcac2 MINIFICPP-878 - Fix AWS build
6cbcac2 is described below
commit 6cbcac28a83109efc41a7b141f8b85ad23892fa6
Author: Arpad Boda <[email protected]>
AuthorDate: Thu May 23 14:42:00 2019 +0200
MINIFICPP-878 - Fix AWS build
This closes #568.
Signed-off-by: Marc Parisi <[email protected]>
---
bootstrap.sh | 3 +--
extensions/aws/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index fe61f9e..4823df9 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -264,8 +264,7 @@ add_dependency USB_ENABLED "libpng"
add_disabled_option GPS_ENABLED ${FALSE} "ENABLE_GPS"
add_dependency GPS_ENABLED "gpsd"
-MINIFICPP-874
-#add_disabled_option AWS_ENABLED ${TRUE} "ENABLE_AWS"
+add_disabled_option AWS_ENABLED ${TRUE} "ENABLE_AWS"
add_disabled_option KAFKA_ENABLED ${FALSE} "ENABLE_LIBRDKAFKA" "3.4.0"
diff --git a/extensions/aws/CMakeLists.txt b/extensions/aws/CMakeLists.txt
index a80f862..e0b0b07 100644
--- a/extensions/aws/CMakeLists.txt
+++ b/extensions/aws/CMakeLists.txt
@@ -29,7 +29,7 @@ set(BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-install/")
ExternalProject_Add(
awssdk-external
GIT_REPOSITORY "https://github.com/aws/aws-sdk-cpp.git";
- GIT_TAG "09b65deba03cfbef9a1e5d5986aa4de71bc03cd8"
+ GIT_TAG "66666d9437429c28927576cb5c898e490f8c8cf9"
EXCLUDE_FROM_ALL TRUE
INSTALL_DIR ${BYPRODUCT}
CMAKE_ARGS -DBUILD_ONLY=s3
