diff --git a/CMakeLists.txt b/CMakeLists.txt index 0009cbe8..84c09688 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(Candy VERSION 6.1.3) +project(Candy VERSION 6.1.4) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/candy-service/src/main.cc b/candy-service/src/main.cc index fe3754a5..c15d0b72 100644 --- a/candy-service/src/main.cc +++ b/candy-service/src/main.cc @@ -247,9 +247,11 @@ class CandyServiceApp : public Poco::Util::ServerApplication { Poco::Net::HTTPServer server(new JSONRequestHandlerFactory, socket, params); server.start(); - std::cout << "candy-service bind: " << bindAddress << ":" << port << std::endl; + spdlog::info("bind: {}:{}", bindAddress, port); waitForTerminationRequest(); + spdlog::info("exit signal detected"); + server.stop(); std::lock_guard lock(threadMutex); diff --git a/candy/src/peer/message.cc b/candy/src/peer/message.cc index ba0cdda1..6eb3410b 100644 --- a/candy/src/peer/message.cc +++ b/candy/src/peer/message.cc @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT #include "peer/message.h" #include diff --git a/candy/src/peer/peer.cc b/candy/src/peer/peer.cc index be50bf0b..206a9c71 100644 --- a/candy/src/peer/peer.cc +++ b/candy/src/peer/peer.cc @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT #include "peer/peer.h" #include "core/client.h" #include "core/message.h" diff --git a/cmake/openssl/CMakeLists.txt b/cmake/openssl/CMakeLists.txt index 9cd1faa4..576118ce 100644 --- a/cmake/openssl/CMakeLists.txt +++ b/cmake/openssl/CMakeLists.txt @@ -8,11 +8,13 @@ include(ExternalProject) ExternalProject_Add( openssl PREFIX ${CMAKE_CURRENT_BINARY_DIR}/openssl - URL https://www.openssl.org/source/openssl-3.4.0.tar.gz + URL https://www.openssl.org/source/openssl-3.5.4.tar.gz LOG_BUILD ON BUILD_IN_SOURCE YES + CONFIGURE_COMMAND + COMMAND sed -i "s/disable('static', 'pic', 'threads')/disable('static', 'pic')/" Configure + COMMAND ./config --release no-unit-test no-shared ${TARGET_OPENSSL} CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} BUILD_COMMAND "" - CONFIGURE_COMMAND ./config --release no-unit-test no-shared ${TARGET_OPENSSL} CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} INSTALL_COMMAND "" TEST_COMMAND "" ) diff --git a/scripts/build-standalone.sh b/scripts/build-standalone.sh index 3ea54807..85deefe6 100755 --- a/scripts/build-standalone.sh +++ b/scripts/build-standalone.sh @@ -49,8 +49,8 @@ export AR="$COMPILER_ROOT/bin/$TARGET-ar" export LD="$COMPILER_ROOT/bin/$TARGET-ld" export RANLIB="$COMPILER_ROOT/bin/$TARGET-ranlib" export STRIP="$COMPILER_ROOT/bin/$TARGET-strip" -export CFLAGS="-I $COMPILER_ROOT/$TARGET/include -L $COMPILER_ROOT/$TARGET/lib" -export LDFLAGS="-static $CFLAGS" +export CFLAGS="-I $COMPILER_ROOT/$TARGET/include" +export LDFLAGS="-static -Wl,--whole-archive -latomic -Wl,--no-whole-archive $CFLAGS" if [[ $CANDY_OS && $CANDY_ARCH ]];then BUILD_DIR="$CANDY_WORKSPACE/build/$CANDY_OS-$CANDY_ARCH"