mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-27 15:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Configure: fixed static compilation with OpenSSL 1.1.1.

Browse Source 
OpenSSL now uses pthread_atfork(), and this requires -lpthread on Linux
to compile.  Introduced NGX_LIBPTHREAD to add it as appropriate, similar
to existing NGX_LIBDL.
This commit is contained in:
Maxim Dounin 2018-03-22 15:55:57 +03:00
parent 25a26bbce4
commit 90ca1071b7
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
auto/lib/openssl/conf
View File

@ -41,6 +41,7 @@ if [ $OPENSSL != NONE ]; then
CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
CORE_LIBS="$CORE_LIBS $NGX_LIBDL" CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD"
if [ "$NGX_PLATFORM" = win32 ]; then if [ "$NGX_PLATFORM" = win32 ]; then
CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32"
@ -59,7 +60,7 @@ else
ngx_feature_run=no ngx_feature_run=no
ngx_feature_incs="#include <openssl/ssl.h>" ngx_feature_incs="#include <openssl/ssl.h>"
ngx_feature_path= ngx_feature_path=
ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL" ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD"
ngx_feature_test="SSL_CTX_set_options(NULL, 0)" ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
. auto/feature . auto/feature
@ -71,11 +72,13 @@ else
ngx_feature_path="/usr/local/include" ngx_feature_path="/usr/local/include"
if [ $NGX_RPATH = YES ]; then if [ $NGX_RPATH = YES ]; then
ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto $NGX_LIBDL" ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto"
else else
ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto $NGX_LIBDL" ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto"
fi fi
ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
. auto/feature . auto/feature
fi fi
@ -87,11 +90,13 @@ else
ngx_feature_path="/usr/pkg/include" ngx_feature_path="/usr/pkg/include"
if [ $NGX_RPATH = YES ]; then if [ $NGX_RPATH = YES ]; then
ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL" ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto"
else else
ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL" ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto"
fi fi
ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
. auto/feature . auto/feature
fi fi
@ -103,11 +108,13 @@ else
ngx_feature_path="/opt/local/include" ngx_feature_path="/opt/local/include"
if [ $NGX_RPATH = YES ]; then if [ $NGX_RPATH = YES ]; then
ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto $NGX_LIBDL" ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto"
else else
ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto $NGX_LIBDL" ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto"
fi fi
ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
. auto/feature . auto/feature
fi fi

1
auto/threads
View File

@ -17,4 +17,5 @@ END
CORE_DEPS="$CORE_DEPS $THREAD_POOL_DEPS" CORE_DEPS="$CORE_DEPS $THREAD_POOL_DEPS"
CORE_SRCS="$CORE_SRCS $THREAD_POOL_SRCS" CORE_SRCS="$CORE_SRCS $THREAD_POOL_SRCS"
CORE_LIBS="$CORE_LIBS -lpthread" CORE_LIBS="$CORE_LIBS -lpthread"
NGX_LIBPTHREAD="-lpthread"
fi fi

1
auto/unix
View File

@ -901,6 +901,7 @@ if [ $ngx_found = no ]; then
if [ $ngx_found = yes ]; then if [ $ngx_found = yes ]; then
CORE_LIBS="$CORE_LIBS -lpthread" CORE_LIBS="$CORE_LIBS -lpthread"
NGX_LIBPTHREAD="-lpthread"
fi fi
fi fi