etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2025-04-09 16:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

updated wolfssl to 5.1.1 to fix a windows build bug

Browse source
This commit is contained in:
Jacker 2022-11-08 12:36:15 +02:00
parent 3c0ae3a64a
commit fe42d88871
2 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -146,10 +146,9 @@ if(FEATURE_SSL AND BUNDLED_WOLFSSL AND (BUILD_CLIENT OR BUILD_SERVER))
ExternalProject_Add(bundled_wolfssl
DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR}
URL https://github.com/wolfSSL/wolfssl/archive/v5.0.0-stable.tar.gz
URL_HASH MD5=d2044f756db0853dd2da0a90dd42ab62
URL https://github.com/wolfSSL/wolfssl/archive/v5.1.1-stable.tar.gz
URL_HASH MD5=d84a2c724a900e2f83a51f3f160a6505
SOURCE_DIR "${LIBS_DOWNLOAD_SRC_DIR}/wolfssl"
PATCH_COMMAND ${WOLFSSL_PATCH_COMMAND}
BINARY_DIR ${LIBS_BINARY_DIR}/wolfssl
BUILD_BYPRODUCTS ${_WOLFSSL_OUTPUT}
PREFIX ${LIBS_BINARY_DIR}/wolfssl
@ -163,11 +162,15 @@ if(FEATURE_SSL AND BUNDLED_WOLFSSL AND (BUILD_CLIENT OR BUILD_SERVER))
-DWOLFSSL_OPENSSL_EXTRA=ON -DBUILD_PWDBASED=ON
-DWOLFSSL_PWDBASED=ON -DBUILD_CRL=ON
-DWOLFSSL_DES3=ON -DWOLFSSL_TLSX=ON
-DBUILD_SHARED_LIBS=OFF
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW # This is just for MSCV
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug> # No more patching needed!
-DCMAKE_INSTALL_PREFIX=${LIBS_BINARY_DIR}/wolfssl
)
set_target_properties(bundled_wolfssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER})
add_dependencies(bundled_wolfssl_int bundled_wolfssl)
target_link_libraries(bundled_wolfssl_int INTERFACE ${WOLFSSL_BUNDLED_LIBRARY})
target_include_directories(bundled_wolfssl_int INTERFACE "${LIBS_BINARY_DIR}/wolfssl/include" "${LIBS_BINARY_DIR}/wolfssl/include/wolfssl")
target_compile_definitions(bundled_wolfssl_int INTERFACE ETL_WOLFSSL)

28
patches/WolfSSL.patch
View file

@ -1,28 +0,0 @@
--- wolfssl-4.7.0-stable/CMakeLists.txt 2021-02-16 00:29:51.000000000 +0200
+++ wolfssl-4.7.0-stable-patched/CMakeLists.txt 2021-02-25 10:50:37.000000000 +0200
@@ -1508,3 +1508,25 @@
# TODO: Distro build + rules for what to include in the distro.
# See various include.am files.
+
+#MSVC patch
+option(LEGACY_MSVC_STATIC "Build with static MSVC runtime" ON)
+if(MSVC AND LEGACY_MSVC_STATIC)
+ message(STATUS "Patching MSVC build for static linking")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHsc /O2")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHa /W3")
+
+ set(CompilerFlags
+ CMAKE_CXX_FLAGS
+ CMAKE_CXX_FLAGS_DEBUG
+ CMAKE_CXX_FLAGS_RELEASE
+ CMAKE_C_FLAGS
+ CMAKE_C_FLAGS_DEBUG
+ CMAKE_C_FLAGS_RELEASE
+ )
+
+ foreach(CompilerFlag ${CompilerFlags})
+ string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
+ endforeach()
+endif()
+