public/simple-object-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'Generic Commit'
All checks were successful
Build-Test-Publish / build (push) Successful in 14m30s
Details

Browse Source
This commit is contained in:
Your Name
2025-06-14 17:23:32 +12:00
parent 46e2a7b345
commit 62a2a1231a
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile.dropshell-build
View File

@@ -16,10 +16,15 @@ ENV CCACHE_MAXSIZE=2G
COPY . . COPY . .
# Multi-architecture OpenSSL detection handled in cmake step
# Configure and build with ccache using cache mounts # Configure and build with ccache using cache mounts
RUN --mount=type=cache,target=/ccache \ RUN --mount=type=cache,target=/ccache \
--mount=type=cache,target=/build \ --mount=type=cache,target=/build \
mkdir -p /build && \ mkdir -p /build && \
SSL_LIB=$(find /usr/local -name "libssl.a" | head -1) && \
CRYPTO_LIB=$(find /usr/local -name "libcrypto.a" | head -1) && \
echo "Found SSL: $SSL_LIB, Crypto: $CRYPTO_LIB" && \
cmake -G Ninja -S /app -B /build \ cmake -G Ninja -S /app -B /build \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -35,7 +40,9 @@ RUN --mount=type=cache,target=/ccache \
-DCMAKE_STRIP=OFF \ -DCMAKE_STRIP=OFF \
-DIGNORE_DYNAMIC_LOADING=ON \ -DIGNORE_DYNAMIC_LOADING=ON \
-DOPENSSL_ROOT_DIR=/usr/local \ -DOPENSSL_ROOT_DIR=/usr/local \
-DOPENSSL_LIBRARIES="/usr/local/lib64/libssl.a;/usr/local/lib64/libcrypto.a" \ -DOPENSSL_USE_STATIC_LIBS=TRUE \
-DOPENSSL_SSL_LIBRARY="$SSL_LIB" \
-DOPENSSL_CRYPTO_LIBRARY="$CRYPTO_LIB" \
-DOPENSSL_INCLUDE_DIR=/usr/local/include \ -DOPENSSL_INCLUDE_DIR=/usr/local/include \
${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE} ${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}

3
src/assert.hpp
View File

@@ -169,6 +169,9 @@ void assert_failed(
std::source_location location std::source_location location
) { ) {
if (!condition) { if (!condition) {
std::cout << std::flush;
std::cerr << std::flush;
std::cerr << colors::red << "Assertion failed at " << location.file_name() << ":" << location.line() << ": " std::cerr << colors::red << "Assertion failed at " << location.file_name() << ":" << location.line() << ": "
<< location.function_name() << ": " << message << colors::reset << "\n"; << location.function_name() << ": " << message << colors::reset << "\n";
print_stacktrace(); print_stacktrace();