From 7fcba999e578fb7fcfa13726af29448b02fd9ad9 Mon Sep 17 00:00:00 2001 From: Joaquin Anton Date: Mon, 15 Apr 2024 17:53:50 +0200 Subject: [PATCH] Adjust to self contained AWS SDK libs Signed-off-by: Joaquin Anton --- cmake/Dependencies.common.cmake | 13 +++++++++---- dali/python/bundle-wheel.sh | 1 - docker/Dockerfile.deps | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cmake/Dependencies.common.cmake b/cmake/Dependencies.common.cmake index d7566a3e499..05761b7b0a8 100644 --- 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 index dec2404a1d2..4768d3648af 100755 --- 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 index 68faf8e3dee..4e37bab12a5 100644 --- 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