diff --git a/.github/CMakeLists.txt b/.github/CMakeLists.txt index a6d36844..ddb1e67c 100644 --- a/.github/CMakeLists.txt +++ b/.github/CMakeLists.txt @@ -47,11 +47,8 @@ find_package(Patch REQUIRED) # Patch command might be applied already, so errors need to be ignored. externalproject_add( libreSSLExternal - DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslDownload - SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource - URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.0.tar.gz" - URL_HASH SHA256=3fc1290f4007ec75f6e9acecbb25512630d1b9ab8c53ba79844e395868c3e006 - PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 --forward -d ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource < + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../deps/libressl/portable + PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 --forward -d ${CMAKE_CURRENT_BINARY_DIR}/../deps/libressl/portable < ${CMAKE_CURRENT_SOURCE_DIR}/ciPatches/libressl-no_postfix.patch || echo "Patch returned non-zero" CMAKE_ARGS -DLIBRESSL_APPS:BOOL=0 -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50681381..c92dea29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,6 +37,10 @@ jobs: echo "ARG_CTEST=-C Debug">> "$env:GITHUB_ENV" - name: Build server with dependencies run: | + echo "BASEDIR=$(pwd)" >> "$env:GITHUB_ENV" + cd Sample-Server/deps/libressl/portable/ + ./autogen.sh + cd ${{ env.BASEDIR }} mkdir -p build cd build cmake ../Sample-Server/.github/ -DCMAKE_INSTALL_PREFIX:PATH=${{ env.CMAKE_INSTALL_PREFIX }} diff --git a/.gitmodules b/.gitmodules index 0ab0f64d..1664bbce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "deps/json"] path = deps/json url = https://github.com/nlohmann/json.git +[submodule "deps/libressl/portable"] + path = deps/libressl/portable + url = https://github.com/libressl-portable/portable.git diff --git a/deps/libressl/portable b/deps/libressl/portable new file mode 160000 index 00000000..5a590f8e --- /dev/null +++ b/deps/libressl/portable @@ -0,0 +1 @@ +Subproject commit 5a590f8e0c1bb3b3bf7ba02ee7d3ac0c1e09a1ae diff --git a/initialbuild.sh b/initialbuild.sh index e404e616..3e91c251 100755 --- a/initialbuild.sh +++ b/initialbuild.sh @@ -23,6 +23,9 @@ BASEDIR=$(pwd) +cd deps/libressl/portable || exit +./autogen.sh +cd $BASEDIR || exit mkdir build cd build || exit cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH="$BASEDIR/install" ../.github/