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

Configure: fixed static nginx build with OpenSSL (ticket #903).

Browse Source 
Before 7142b04337d6, it was possible to build the OpenSSL library
along with nginx, and link nginx statically with this library
(--with-openssl=DIR --with-ld-opt=-static --with-http_ssl_module).
This was broken on Linux by not adding -ldl after -lcrypto.

The fix also makes it possible to link nginx statically on Linux
with the system OpenSSL library, which never worked before.
This commit is contained in:
Ruslan Ermilov 2016-02-18 11:39:57 +03:00
parent faa96e82d2
commit 6fccc00aa8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
auto/lib/openssl/conf
View File

@ -32,6 +32,7 @@ if [ $OPENSSL != NONE ]; then
CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
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"
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"
@ -50,7 +51,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_feature_libs="-lssl -lcrypto $NGX_LIBDL"
ngx_feature_test="SSL_library_init()" ngx_feature_test="SSL_library_init()"
. auto/feature . auto/feature
@ -62,9 +63,9 @@ 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_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto $NGX_LIBDL"
else else
ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto $NGX_LIBDL"
fi fi
. auto/feature . auto/feature
@ -78,9 +79,9 @@ 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_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL"
else else
ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL"
fi fi
. auto/feature . auto/feature
@ -94,9 +95,9 @@ 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_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto $NGX_LIBDL"
else else
ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto $NGX_LIBDL"
fi fi
. auto/feature . auto/feature

1
auto/unix
View File

@ -272,6 +272,7 @@ if [ $ngx_found != yes ]; then
if [ $ngx_found = yes ]; then if [ $ngx_found = yes ]; then
CORE_LIBS="$CORE_LIBS -ldl" CORE_LIBS="$CORE_LIBS -ldl"
NGX_LIBDL="-ldl"
fi fi
fi fi