Merge pull request #5474 from AenBleidd/vko_fix_android_build

[CI] Simplify build, remove custom openssl vcpkg port
BOINC · Dec 27, 2023 · aa0ced8 · aa0ced8
2 parents d4a5218 + e8ba258
commit aa0ced8
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 44 deletions.
diff --git a/3rdParty/vcpkg_ports/configs/apps/android/vcpkg.json b/3rdParty/vcpkg_ports/configs/apps/android/vcpkg.json
@@ -7,6 +7,11 @@
           "features": ["openssl"],
           "default-features": false
         },
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
+        },
         "rappture"
     ]
 }
diff --git a/3rdParty/vcpkg_ports/configs/apps/linux/vcpkg.json b/3rdParty/vcpkg_ports/configs/apps/linux/vcpkg.json
@@ -7,6 +7,11 @@
           "features": ["openssl"],
           "default-features": false
         },
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
+        },
         "rappture",
         "opencl",
         "ftgl",

diff --git a/3rdParty/vcpkg_ports/configs/apps/mingw/vcpkg.json b/3rdParty/vcpkg_ports/configs/apps/mingw/vcpkg.json
@@ -7,6 +7,11 @@
           "features": ["openssl"],
           "default-features": false
         },
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
+        },
         "rappture",
         "ftgl",
         "freeglut",

diff --git a/3rdParty/vcpkg_ports/configs/client/vcpkg.json b/3rdParty/vcpkg_ports/configs/client/vcpkg.json
@@ -6,6 +6,11 @@
           "name": "curl",
           "features": ["openssl"],
           "default-features": false
+        },
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
         }
     ]
 }
diff --git a/3rdParty/vcpkg_ports/configs/client/wasm/vcpkg.json b/3rdParty/vcpkg_ports/configs/client/wasm/vcpkg.json
@@ -7,6 +7,11 @@
           "features": ["openssl"],
           "default-features": false
         },
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
+        },
         "rappture"
     ]
 }
diff --git a/3rdParty/vcpkg_ports/configs/libs/vcpkg.json b/3rdParty/vcpkg_ports/configs/libs/vcpkg.json
@@ -6,6 +6,11 @@
           "name": "curl",
           "features": ["openssl"],
           "default-features": false
+        },
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
         }
     ]
 }
diff --git a/3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json b/3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json
@@ -7,6 +7,10 @@
           "features": ["schannel"],
           "default-features": false
         },
-        "openssl"
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
+        }
     ]
 }
diff --git a/3rdParty/vcpkg_ports/configs/manager/linux/vcpkg.json b/3rdParty/vcpkg_ports/configs/manager/linux/vcpkg.json
@@ -7,6 +7,11 @@
           "features": ["openssl"],
           "default-features": false
         },
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
+        },
         {
           "name": "wxwidgets",
           "default-features": false

diff --git a/3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json b/3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json
@@ -7,7 +7,11 @@
         "features": ["schannel"],
         "default-features": false
       },
-      "openssl",
+      {
+        "name": "openssl",
+        "features": ["ssl3", "weak-ssl-ciphers"],
+        "default-features": false
+      },
       "rappture",
       {
         "name": "wxwidgets",

diff --git a/3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json b/3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json
@@ -7,7 +7,11 @@
           "features": ["schannel"],
           "default-features": false
         },
-        "openssl",
+        {
+          "name": "openssl",
+          "features": ["ssl3", "weak-ssl-ciphers"],
+          "default-features": false
+        },
         "rappture",
         {
           "name": "wxwidgets",

diff --git a/3rdParty/vcpkg_ports/ports/openssl/unix/disable-quicserver.patch b/3rdParty/vcpkg_ports/ports/openssl/unix/disable-quicserver.patch
@@ -1,48 +1,13 @@
-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..f5b87869a1 100644
+index cf06f15ae4f0e..e4aab44b38038 100644
 --- a/util/build.info
 +++ b/util/build.info
 @@ -6,9 +6,9 @@ SCRIPTS{noinst}=wrap.pl
  SOURCE[wrap.pl]=wrap.pl.in
  DEPEND[wrap.pl]=../configdata.pm
 
 -IF[{- !$disabled{quic} && !$disabled{stdio} -}]
-+IF[{- !$disabled{quic} && !$disabled{stdio} && !$disabled{quicserver} -}]
++IF[{- !$disabled{quic} && !$disabled{stdio} && !$disabled{apps} -}]
    PROGRAMS{noinst}=quicserver
    SOURCE[quicserver]=quicserver.c
 -INCLUDE[quicserver]=../include ../apps/include

diff --git a/3rdParty/vcpkg_ports/ports/openssl/unix/portfile.cmake b/3rdParty/vcpkg_ports/ports/openssl/unix/portfile.cmake
@@ -100,10 +100,6 @@ 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(