Adjust to self contained AWS SDK libs

Signed-off-by: Joaquin Anton <[email protected]>
NVIDIA · Apr 16, 2024 · 7fcba99 · 7fcba99
1 parent 80a01dc
commit 7fcba99
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/cmake/Dependencies.common.cmake b/cmake/Dependencies.common.cmake
@@ -386,8 +386,13 @@ endif()
 # AWS SDK
 ##################################################################
 if(BUILD_AWSSDK)
-  find_package(AWSSDK REQUIRED COMPONENTS s3)
-  message(STATUS "aws-sdk-cpp include dir: ${AWSSDK_INCLUDE_DIR}")
-  message(STATUS "aws-sdk-cpp lib dir: ${AWSSDK_LIB_DIR}")
-  message(STATUS "aws-sdk-cpp libs: ${AWSSDK_LIBRARIES}")
+  find_package(AWSSDK COMPONENTS s3)
+  if (AWSSDK_FOUND)
+    message(STATUS "aws-sdk-cpp include dir: ${AWSSDK_INCLUDE_DIR}")
+    message(STATUS "aws-sdk-cpp lib dir: ${AWSSDK_LIB_DIR}")
+    message(STATUS "aws-sdk-cpp libs: ${AWSSDK_LIBRARIES}")
+  else()
+    message(WARNING "AWS SDK not found. Disabling AWS SDK support.")
+    set(BUILD_AWSSDK OFF)
+  endif()
 endif()
diff --git a/dali/python/bundle-wheel.sh b/dali/python/bundle-wheel.sh
@@ -124,7 +124,6 @@ DEPS_LIST=(
     "${DEPS_PATH}/lib/libcfitsio.so.4"
     "${DEPS_PATH}/lib/libaws-cpp-sdk-core.so"
     "${DEPS_PATH}/lib/libaws-cpp-sdk-s3.so"
-    "${DEPS_PATH}/lib/libcurl.so.4"
     "lib/libcvcuda.so.0"
     "lib/libnvcv_types.so.0"
     # cvcuda adds _d suffix to lib names for debug builds

diff --git a/docker/Dockerfile.deps b/docker/Dockerfile.deps
@@ -8,7 +8,7 @@ FROM ${BUILDER_EXTRA_DEPS} as extra_deps
 FROM ${FROM_IMAGE_NAME}
 
 # Install yum Dependencies
-RUN yum install -y wget nasm doxygen graphviz gettext xz openssl openssl-devel libcurl-devel autogen zip \
+RUN yum install -y wget nasm doxygen graphviz gettext xz openssl autogen zip perl \
                    devtoolset-10-libasan-devel devtoolset-10-liblsan-devel \
                    devtoolset-10-libtsan-devel devtoolset-10-libubsan-devel
 ENV ACLOCAL_PATH=/usr/share/aclocal/:/usr/local/share/aclocal