Skip to content

修复静态链接 OpenSSL 导致的崩溃 #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lanthora merged 1 commit into from
Nov 20, 2025
Merged

修复静态链接 OpenSSL 导致的崩溃 #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 3 additions & 1 deletion candy-service/src/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions candy/src/peer/message.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
#include "peer/message.h"
#include <string>

Expand Down
1 change: 1 addition & 0 deletions candy/src/peer/peer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
#include "peer/peer.h"
#include "core/client.h"
#include "core/message.h"
Expand Down
6 changes: 4 additions & 2 deletions cmake/openssl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
)
4 changes: 2 additions & 2 deletions scripts/build-standalone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down