public/dropshell-build
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json fixed, still errors
Some checks failed
dropshell-build / build (push) Failing after 6s
Details

Browse Source
This commit is contained in:
j842 2025-06-10 13:00:55 +12:00
parent 078e32a965
commit ec1293113f
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-base/Dockerfile.dropshell-build-base
View File

@ -74,8 +74,8 @@ RUN curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz &&
make install_sw && \ make install_sw && \
cd / && rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz cd / && rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz
# Build jsoncpp statically with musl - use latest stable version # Build jsoncpp statically with musl - use stable version known to work with Drogon
ARG JSONCPP_VERSION=1.9.6 ARG JSONCPP_VERSION=1.9.5
WORKDIR /tmp WORKDIR /tmp
RUN curl -LO https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/${JSONCPP_VERSION}.tar.gz && \ RUN curl -LO https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/${JSONCPP_VERSION}.tar.gz && \
tar xzf ${JSONCPP_VERSION}.tar.gz && \ tar xzf ${JSONCPP_VERSION}.tar.gz && \

19
tests/ipdemo/CMakeLists.txt
View File

@ -97,28 +97,15 @@ set(EXTRA_LIBS
# Set paths for libraries before finding Drogon # Set paths for libraries before finding Drogon
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/local)
/usr/local/jsoncpp
/usr/local/openssl-musl
/usr/local/pgsql
/usr/local/mariadb-connector-c
/usr/local/sqlite3
/usr/local/mysql
/usr/local/cares
/usr/local/curl
)
# Explicitly set jsoncpp paths for Drogon's FindJsoncpp.cmake
set(JSONCPP_INCLUDE_DIRS /usr/local/jsoncpp/include)
set(JSONCPP_LIBRARIES /usr/local/jsoncpp/lib/libjsoncpp.a)
find_package(Drogon CONFIG REQUIRED) find_package(Drogon CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon) target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon)
# Additional PostgreSQL libraries needed for static linking # Additional PostgreSQL libraries needed for static linking
set(POSTGRESQL_EXTRA_LIBS set(POSTGRESQL_EXTRA_LIBS
/usr/local/pgsql/lib/libpgcommon.a /usr/local/lib/libpgcommon.a
/usr/local/pgsql/lib/libpgport.a /usr/local/lib/libpgport.a
) )
# Link libraries # Link libraries