From 7fb1c88fd310e503733285b9e99105d98c5f3e02 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Mon, 25 Dec 2023 11:53:26 +0100 Subject: [PATCH] [CI] Optimize vcpkg openssl build fix Signed-off-by: Vitalii Koshura --- .../openssl/unix/disable-quicserver.patch | 51 ++++++++++++++++--- .../ports/openssl/unix/portfile.cmake | 4 ++ 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/3rdParty/vcpkg_ports/ports/openssl/unix/disable-quicserver.patch b/3rdParty/vcpkg_ports/ports/openssl/unix/disable-quicserver.patch index 4c3c9d672e..850649e953 100644 --- a/3rdParty/vcpkg_ports/ports/openssl/unix/disable-quicserver.patch +++ b/3rdParty/vcpkg_ports/ports/openssl/unix/disable-quicserver.patch @@ -1,15 +1,52 @@ +diff --git a/Configure b/Configure +index cca1ac8d16..f1d51b34a2 100755 +--- a/Configure ++++ b/Configure +@@ -95,6 +95,7 @@ EOF + # library and will be loaded at run-time by the OpenSSL library. + # sctp include SCTP support + # no-quic disable QUIC support ++# no-quicserver disable building "quicserver" utility + # no-uplink Don't build support for UPLINK interface. + # enable-weak-ssl-ciphers + # Enable weak ciphers that are disabled by default. +@@ -484,6 +485,7 @@ my @disablables = ( + "posix-io", + "psk", + "quic", ++ "quicserver", + "rc2", + "rc4", + "rc5", +diff --git a/INSTALL.md b/INSTALL.md +index 37b57027f4..a1c00ccd1a 100644 +--- a/INSTALL.md ++++ b/INSTALL.md +@@ -979,6 +979,10 @@ Build with support for TCP Fast Open (RFC7413). Supported on Linux, macOS and Fr + + Don't build with QUIC support. + ++### no-quicserver ++ ++Don't build QUIC server utility. ++ + ### no-threads + + Don't build with support for multi-threaded applications. diff --git a/util/build.info b/util/build.info -index cf06f15ae4..aad7c50fee 100644 +index cf06f15ae4..f5b87869a1 100644 --- a/util/build.info +++ b/util/build.info -@@ -5,10 +5,3 @@ ENDIF - SCRIPTS{noinst}=wrap.pl +@@ -6,9 +6,9 @@ SCRIPTS{noinst}=wrap.pl SOURCE[wrap.pl]=wrap.pl.in DEPEND[wrap.pl]=../configdata.pm -- + -IF[{- !$disabled{quic} && !$disabled{stdio} -}] -- PROGRAMS{noinst}=quicserver -- SOURCE[quicserver]=quicserver.c ++IF[{- !$disabled{quic} && !$disabled{stdio} && !$disabled{quicserver} -}] + PROGRAMS{noinst}=quicserver + SOURCE[quicserver]=quicserver.c -INCLUDE[quicserver]=../include ../apps/include -DEPEND[quicserver]=../libcrypto.a ../libssl.a --ENDIF ++ INCLUDE[quicserver]=../include ../apps/include ++ DEPEND[quicserver]=../libcrypto.a ../libssl.a + ENDIF diff --git a/3rdParty/vcpkg_ports/ports/openssl/unix/portfile.cmake b/3rdParty/vcpkg_ports/ports/openssl/unix/portfile.cmake index 02e62732d5..1998a0f5ba 100644 --- a/3rdParty/vcpkg_ports/ports/openssl/unix/portfile.cmake +++ b/3rdParty/vcpkg_ports/ports/openssl/unix/portfile.cmake @@ -100,6 +100,10 @@ else() message(FATAL_ERROR "Unknown platform") endif() +vcpkg_list(APPEND CONFIGURE_OPTIONS + no-quicserver +) + file(MAKE_DIRECTORY "${SOURCE_PATH}/vcpkg") file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}/vcpkg") vcpkg_configure_make(