diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77d86198..7f0c029e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,6 +134,7 @@ jobs: mkdir -p build && cd build cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/x86_64-linux-gnu.cmake make -j4 + ldd neuron - name: function test run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index ee1d02da..b82ddea5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ else() set(CMAKE_PREFIX_PATH ${CMAKE_STAGING_PREFIX}) include_directories(${CMAKE_STAGING_PREFIX}/include ${CMAKE_STAGING_PREFIX}/openssl/include) link_directories(${CMAKE_STAGING_PREFIX} ${CMAKE_STAGING_PREFIX}/lib ${CMAKE_STAGING_PREFIX}/lib/${COMPILER_PREFIX} ${CMAKE_STAGING_PREFIX}/openssl/lib) + message(STATUS ${CMAKE_STAGING_PREFIX}) endif() @@ -136,7 +137,7 @@ if(APPLE) else() target_link_libraries(neuron dl nng jansson yaml neuron-base) endif() -target_link_libraries(neuron ssl crypto ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(neuron libzlog.so ssl crypto ${CMAKE_THREAD_LIBS_INIT}) # define neuron base library set(NEURON_BASE_SOURCES diff --git a/install.sh b/install.sh index 8deeefa1..e8634024 100755 --- a/install.sh +++ b/install.sh @@ -64,10 +64,23 @@ function build_openssl() { fi } +function build_zlog() { + git clone -b 1.2.15 https://github.com/HardySimpson/zlog.git + cd zlog + make CC=${compiler_prefix}-gcc + if [ $compiler_prefix == "x86_64-linux-gnu" ]; then + sudo make install + sudo make PREFIX=${install_dir} install + else + sudo make PREFIX=${install_dir} install + fi +} + ssl_lib_flag="-DOPENSSL_ROOT_DIR=${install_dir}/openssl \ -DOPENSSL_INCLUDE_DIR=${install_dir}/openssl/include \ -DOPENSSL_LIBRARIES='${install_dir}/openssl/lib'" +build_zlog compile_source yaml/libyaml.git 0.2.5 "-DBUILD_SHARED_LIBS=OFF" compile_source madler/zlib.git v1.2.11 compile_source akheron/jansson.git v2.14 "-DJANSSON_BUILD_DOCS=OFF -DJANSSON_EXAMPLES=OFF"