diff --git a/CMakeLists.txt b/CMakeLists.txt index 40f147c9cea7c98cc1312b5ac04674431f52f721..e395b61b66581388ebf835d6b4622cb621262082 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,20 +181,20 @@ include (hotpatch.cmake) ## other dependency include set(DSS_SECUREC_INC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/huawei_security/include") -set(DSS_OPENSSL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/openssl/include") +set(DSS_OPENSSL_PATH "/usr/include/openssl") set(DSS_CBB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/cbb/include") set(LIBAIO_INC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/libaio/include") set(ZLIB_INC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/zlib/include") -set(LZ4_INC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/lz4/include") +set(LZ4_INC_PATH "$/usr/include/lz4") set(JAVA_HOME "$ENV{JAVA_HOME}/include") set(JAVA_HOME_INCLUDE "$ENV{JAVA_HOME}/include/linux") ## lib set(SECUREC_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/huawei_security/lib") -set(OPENSSL_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/openssl/lib") +set(OPENSSL_LIB_PATH "/usr/lib64") set(CBB_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/cbb/lib") set(LIBZ_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/zlib/lib") -set(LZ4_PATH "${CMAKE_CURRENT_SOURCE_DIR}/library/lz4/lib") +set(LZ4_PATH "/usr/lib64") ## output path set (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/output/lib) @@ -214,8 +214,9 @@ set(3rd_libccb "libcbb.a") set(libz "libz.a") set(lz4 "lz4") -set(vpp_libipsi_crypto "libcrypto.a") -set(3rd_libssl "libssl.a") +find_package(OpenSSL REQUIRED) +set(vpp_libipsi_crypto "OpenSSL::Crypto") +set(3rd_libssl "OpenSSL::SSL") link_directories(${OPENSSL_LIB_PATH}) add_subdirectory(src) diff --git a/build/linux/opengauss/build.sh b/build/linux/opengauss/build.sh index ba9c79de7a96c4e418e153824d5d3ccee57dc248..925633ea56fc9f5702a24874573e623bbf39b21f 100644 --- a/build/linux/opengauss/build.sh +++ b/build/linux/opengauss/build.sh @@ -121,9 +121,7 @@ export DSS_LIBRARYS=$(pwd)/../../../library [ -d "${DSS_LIBRARYS}" ] && rm -rf ${DSS_LIBRARYS} mkdir -p $DSS_LIBRARYS/huawei_security -mkdir -p $DSS_LIBRARYS/openssl mkdir -p $DSS_LIBRARYS/zlib -mkdir -p $DSS_LIBRARYS/lz4 mkdir -p $DSS_LIBRARYS/libaio/include mkdir -p $DSS_LIBRARYS/cbb @@ -132,14 +130,10 @@ export P_LIB_PATH=$binarylib_dir/kernel/platform COPT_LIB_PATH=${binarylib_dir}/kernel/component cp -r $P_LIB_PATH/Huawei_Secure_C/comm/lib $DSS_LIBRARYS/huawei_security/lib -cp -r $LIB_PATH/openssl/comm/lib $DSS_LIBRARYS/openssl/lib cp -r $LIB_PATH/zlib1.2.11/comm/lib $DSS_LIBRARYS/zlib/lib -cp -r $LIB_PATH/lz4/comm/lib $DSS_LIBRARYS/lz4/lib cp -r $P_LIB_PATH/Huawei_Secure_C/comm/include $DSS_LIBRARYS/huawei_security/include -cp -r $LIB_PATH/openssl/comm/include $DSS_LIBRARYS/openssl/include cp -r $LIB_PATH/zlib1.2.11/comm/include $DSS_LIBRARYS/zlib/include -cp -r $LIB_PATH/lz4/comm/include $DSS_LIBRARYS/lz4/include status=0 if [ -f "/usr/include/libaio.h" ];then @@ -167,9 +161,6 @@ fi cp -r $COPT_LIB_PATH/cbb/include $DSS_LIBRARYS/cbb/include cp -r $COPT_LIB_PATH/cbb/lib $DSS_LIBRARYS/cbb/lib -cd $DSS_LIBRARYS/openssl/lib -cp -r libssl_static.a libssl.a -cp -r libcrypto_static.a libcrypto.a cd $PACKAGE if [ "$build_tool"x == "cmake"x ];then