From 8656cbc81e29bc6f658b555db0a7d419050919b7 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Tue, 17 Dec 2024 03:13:07 +0100 Subject: [PATCH] openssh: drop openssl and zlib dependencies We actually don't need them for building the only 2 executables we care about (scp & sftp-server). --- cmake/CMakeLists.txt | 2 +- thirdparty/openssh/CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index b36ee8c92..dbfa16e03 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -348,7 +348,7 @@ if(CERVANTES OR KINDLE OR KOBO OR POCKETBOOK) else() set(EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL) endif() -declare_project(thirdparty/openssh ${EXCLUDE_FROM_ALL} DEPENDS openssl zlib) +declare_project(thirdparty/openssh ${EXCLUDE_FROM_ALL}) # openssl declare_project(thirdparty/openssl) diff --git a/thirdparty/openssh/CMakeLists.txt b/thirdparty/openssh/CMakeLists.txt index c108d314f..1ccadb9e5 100644 --- a/thirdparty/openssh/CMakeLists.txt +++ b/thirdparty/openssh/CMakeLists.txt @@ -13,12 +13,10 @@ list(APPEND CFG_CMD --disable-etc-default-login --disable-lastlog --with-md5-passwords - --with-openssl - --with-ssl-engine --without-hardening + --without-openssl --without-stackprotect - --with-ssl-dir=${STAGING_DIR} - --with-zlib=${STAGING_DIR} + --without-zlib ) list(APPEND BUILD_CMD COMMAND make sftp-server scp)