stop using an overlay for focal, and stop using the static-libssl pre…

…set as a local build default
openziti · Jul 9, 2024 · bbd11e5 · bbd11e5
1 parent e0f1d4e
commit bbd11e5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/scripts/ziti-builder.sh b/scripts/ziti-builder.sh
@@ -124,10 +124,9 @@ function main() {
             -E make_directory \
             ./build  
         cmake \
-            --preset "${CMAKE_PRESET:-ci-linux-x64-static-libssl}" \
+            --preset "${CMAKE_PRESET:-ci-linux-x64}" \
             -DCMAKE_BUILD_TYPE="${CMAKE_CONFIG:-Release}" \
             -DBUILD_DIST_PACKAGES="${BUILD_DIST_PACKAGES:-OFF}" \
-            -DVCPKG_OVERLAY_PORTS="./vcpkg-overlays/linux-syslibs/ubuntu20" \
             "${TLSUV_TLSLIB:+-DTLSUV_TLSLIB=${TLSUV_TLSLIB}}" \
             -S . \
             -B ./build \

diff --git a/vcpkg-overlays/linux-syslibs/ubuntu20/zlib/portfile.cmake b/vcpkg-overlays/linux-syslibs/ubuntu20/zlib/portfile.cmake
diff --git a/vcpkg-overlays/linux-syslibs/ubuntu20/zlib/vcpkg.json b/vcpkg-overlays/linux-syslibs/ubuntu20/zlib/vcpkg.json