-
Notifications
You must be signed in to change notification settings - Fork 461
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5473 from AenBleidd/vko_fix_vcpkg_openssl_build
[CI] Optimize vcpkg openssl build fix
- Loading branch information
Showing
2 changed files
with
48 additions
and
7 deletions.
There are no files selected for viewing
51 changes: 44 additions & 7 deletions
51
3rdParty/vcpkg_ports/ports/openssl/unix/disable-quicserver.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters