From 7dfeed59216f193beb7acbbbc0148f031629a3ca Mon Sep 17 00:00:00 2001 From: "Yichun Zhang (agentzh)" Date: Thu, 19 Mar 2020 20:05:20 -0700 Subject: [PATCH] win32/win64: added new patch to fix openssl compilation on windows via the mingw64 toolchain. --- patches/openssl-1.1.1d-win_fix.patch | 11 +++++++++++ util/build-win32.sh | 1 + 2 files changed, 12 insertions(+) create mode 100644 patches/openssl-1.1.1d-win_fix.patch diff --git a/patches/openssl-1.1.1d-win_fix.patch b/patches/openssl-1.1.1d-win_fix.patch new file mode 100644 index 0000000..fe8d035 --- /dev/null +++ b/patches/openssl-1.1.1d-win_fix.patch @@ -0,0 +1,11 @@ +--- openssl-1.1.1d/crypto/threads_none.c 2019-09-10 06:13:07.000000000 -0700 ++++ openssl-1.1.1d-patched/crypto/threads_none.c 2020-03-19 19:58:56.093255300 -0700 +@@ -143,7 +143,7 @@ int openssl_get_fork_id(void) + # if defined(OPENSSL_SYS_UNIX) + return getpid(); + # else +- return return 0; ++ return 0; + # endif + } + #endif diff --git a/util/build-win32.sh b/util/build-win32.sh index ec859d9..1491720 100644 --- a/util/build-win32.sh +++ b/util/build-win32.sh @@ -21,6 +21,7 @@ cd ../.. cd objs/lib/$OPENSSL || exit 1 #patch -p1 < ../../../patches/openssl-1.1.0j-parallel_build_fix.patch || exit 1 patch -p1 < ../../../patches/openssl-1.1.1c-sess_set_get_cb_yield.patch || exit 1 +patch -p1 < ../../../patches/openssl-1.1.1d-win_fix.patch || exit 1 #patch -p1 < ../../../patches/openssl-1.1.1e-sess_set_get_cb_yield.patch || exit 1 cd ../../..