diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d7073fc..b56bf0b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: GIT_STRATEGY: "clone" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ INSTALL_PREFIX: "/home/mesasoft/sapp_run/" - INSTALL_DEPENDENCY_LIBRARY: libMESA_handle_logger-devel libcjson-devel libMESA_field_stat2-devel sapp-devel framework_env libMESA_prof_load-devel http-devel dns-devel ftp-devel mail-devel ssl-devel librdkafka-devel libmaatframe-devel tsg_master-devel libdocumentanalyze-devel zlib-devel openssl-devel curl-devel libaws-c-common libaws-c-common-devel libaws-c-checksums libaws-c-checksums-devel libaws-c-event-stream libaws-c-event-stream-devel libaws-cpp-sdk-core libaws-cpp-sdk-core-devel libaws-cpp-sdk-s3 libaws-cpp-sdk-s3-devel + INSTALL_DEPENDENCY_LIBRARY: libcjson-devel libMESA_field_stat2-devel zlib-devel openssl-devel curl-devel TESTING_VERSION_BUILD: 0 stages: diff --git a/build/usr/local/lib64/hos.conf b/build/usr/local/lib64/hos.conf deleted file mode 100644 index 04ecf183..00000000 --- a/build/usr/local/lib64/hos.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/local/lib64/ \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1d631e91..2941d99a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,7 +10,14 @@ link_directories(${CMAKE_INSTALL_PREFIX}/lib) set(CMKAE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -shared -fPIC") add_library(${lib_name}_shared SHARED hos_client.cpp hos_hash.cpp) -target_link_libraries(${lib_name}_shared PUBLIC libaws-cpp-sdk-core.a libaws-cpp-sdk-s3.a libMESA_field_stat2.so libcurl.so libpthread.so) +target_link_libraries(${lib_name}_shared + "-Wl,--whole-archive" + libaws-cpp-sdk-core.a + libaws-cpp-sdk-s3.a + "-Wl,--no-whole-archive" + libMESA_field_stat2.so + libcurl.so + libpthread.so) set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) #for ASAN diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index fec271eb..e0fc68a3 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -2,7 +2,7 @@ include(ExternalProject) set(AWSS3_ROOT ${CMAKE_CURRENT_BINARY_DIR}) set(AWSS3_URL ${CMAKE_CURRENT_SOURCE_DIR}/aws-sdk-cpp-master.zip) -set(AWSS3_URL_MD5 37cb7cbc2cbf72eac711ae300013c7b5) +set(AWSS3_URL_MD5 7afbfc810ad117243f9a794e2d043e9d) set(AWSS3_CONFIGURE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && cmake . -DBUILD_ONLY=s3) set(AWSS3_MAKE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make) set(AWSS3_INSTALL cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make install PREFIX=${SUPPORT_INSTALL_PREFIX}) diff --git a/support/aws-sdk-cpp-master.zip b/support/aws-sdk-cpp-master.zip index 98a40af4..9629f8e9 100644 Binary files a/support/aws-sdk-cpp-master.zip and b/support/aws-sdk-cpp-master.zip differ