'Generic Commit'

build-base/publish.sh

@@ -3,8 +3,8 @@
 set -euo pipefail
 
 # check standard variables present.
-[[ -n $SOS_WRITE_TOKEN ]] || die "SOS_WRITE_TOKEN not specified"
-[[ -n $DOCKER_PUSH_TOKEN ]] || die "DOCKER_PUSH_TOKEN not specified"
+#[[ -n $SOS_WRITE_TOKEN ]] || die "SOS_WRITE_TOKEN not specified"
+#[[ -n $DOCKER_PUSH_TOKEN ]] || die "DOCKER_PUSH_TOKEN not specified"
 
 
 echo "Publishing dropshell-build-base:test as :latest..."

tests/Dockerfile.test-build

@@ -8,7 +8,7 @@ ARG CMAKE_BUILD_TYPE=Debug
 WORKDIR /app
 
 # Create cache directories
-RUN mkdir -p /ccache /build-cache
+RUN mkdir -p /ccache
 
 # Set up ccache
 ENV CCACHE_DIR=/ccache
@@ -21,6 +21,9 @@ COPY . .
 RUN --mount=type=cache,target=/ccache \
     --mount=type=cache,target=/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 \
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -28,14 +31,11 @@ RUN --mount=type=cache,target=/ccache \
     -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold -static -g" \
     -DCMAKE_CXX_FLAGS="-g -fno-omit-frame-pointer" \
     -DCMAKE_C_FLAGS="-g -fno-omit-frame-pointer" \
-    -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
-    -DZLIB_BUILD_SHARED=OFF \
-    -DZLIB_BUILD_STATIC=ON \
-    -DBUILD_SHARED_LIBS=OFF \
     -DPROJECT_NAME="${PROJECT}" \
     -DCMAKE_STRIP=OFF \
-    -DIGNORE_DYNAMIC_LOADING=ON \
-    -DOPENSSL_USE_STATIC_LIBS=TRUE \
+    -DOPENSSL_SSL_LIBRARY="$SSL_LIB" \
+    -DOPENSSL_CRYPTO_LIBRARY="$CRYPTO_LIB" \
+    -DOPENSSL_INCLUDE_DIR=/usr/local/include \
     ${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
 
 # Build with cache mounts

tests/ipdemo/CMakeLists.txt

@@ -34,19 +34,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR}/src/autogen 
     src)
 
-# Find packages - handle OpenSSL for cross-compilation
-if(NOT TARGET OpenSSL::SSL)
-    find_library(SSL_LIB ssl PATHS /usr/local/lib NO_DEFAULT_PATH REQUIRED)
-    find_library(CRYPTO_LIB crypto PATHS /usr/local/lib NO_DEFAULT_PATH REQUIRED)
-    
-    add_library(OpenSSL::Crypto STATIC IMPORTED)
-    set_property(TARGET OpenSSL::Crypto PROPERTY IMPORTED_LOCATION ${CRYPTO_LIB})
-    
-    add_library(OpenSSL::SSL STATIC IMPORTED) 
-    set_property(TARGET OpenSSL::SSL PROPERTY IMPORTED_LOCATION ${SSL_LIB})
-    target_link_libraries(OpenSSL::SSL INTERFACE OpenSSL::Crypto)
-endif()
-
+# Find packages
+find_package(OpenSSL REQUIRED)
 find_package(Drogon CONFIG REQUIRED)
 find_package(nlohmann_json REQUIRED)
 
@@ -54,4 +43,5 @@ find_package(nlohmann_json REQUIRED)
 target_link_libraries(${PROJECT_NAME} PRIVATE
     nlohmann_json::nlohmann_json Drogon::Drogon
     /usr/local/lib/libpgcommon.a /usr/local/lib/libpgport.a
-    lzma dl)
+    lzma dl)
+