186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

win32/win64: added new patch to fix openssl compilation on windows via the mingw64 toolchain.

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2020-03-19 20:05:20 -07:00
parent 05db2b8e84
commit 7dfeed5921
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/openssl-1.1.1d-win_fix.patch Normal file
View File

@ -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

1
util/build-win32.sh
View File

@ -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 ../../..