CMake: remove unbound patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b184ba3aee0d03ffa4951a213ec66cbbe71679bb..51c20c706eccd2e0aba98c9ac3c432b2485cbfa2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,13 +47,6 @@ if(STATIC)
     message(STATUS "Initiating static build, turning on manual submodules")
     set(MANUAL_SUBMODULES 1)
 
-    # monero-project/unbound:monero has a fix for static builds, however, it's not merged in Monero yet, because
-    # it breaks their buildbot, since that still uses openssl 1.1.0 and we use openssl 1.1.1g. We need to
-    # manually set the unbound submodule the right commit that has the fix.
-    # This only works with -DMANUAL_SUBMODULES=1
-    message(STATUS "applying unbound static build fix contrib/unbound_static.patch")
-    execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/monero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch")
-
     set(Boost_USE_STATIC_LIBS ON)
     set(Boost_USE_STATIC_RUNTIME ON)
 endif()

diff --git a/contrib/unbound_static.patch b/contrib/unbound_static.patch
deleted file mode 100644 (file)
index a680fd5..0000000
--- a/contrib/unbound_static.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/configure_checks.cmake b/configure_checks.cmake
-index c31b3f33..50b3305d 100644
---- a/configure_checks.cmake
-+++ b/configure_checks.cmake
-@@ -202,10 +202,10 @@ check_symbol_exists(NID_X9_62_prime256v1 "openssl/evp.h" HAVE_DECL_NID_X9_62_PRI
- check_symbol_exists(sk_SSL_COMP_pop_free "openssl/ssl.h" HAVE_DECL_SK_SSL_COMP_POP_FREE)
- check_symbol_exists(SSL_COMP_get_compression_methods "openssl/ssl.h" HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS)
- 
--check_function_exists(EVP_MD_CTX_new HAVE_EVP_MD_CTX_NEW)
-+set(HAVE_EVP_MD_CTX_NEW 1)
- check_function_exists(EVP_sha1 HAVE_EVP_SHA1)
--check_function_exists(EVP_sha256 HAVE_EVP_SHA256)
--check_function_exists(EVP_sha512 HAVE_EVP_SHA512)
-+set(HAVE_EVP_SHA256 1)
-+set(HAVE_EVP_SHA512 1)
- check_function_exists(FIPS_mode HAVE_FIPS_MODE)
- check_function_exists(HMAC_Update HAVE_HMAC_UPDATE)
- check_function_exists(OPENSSL_config HAVE_OPENSSL_CONFIG)