mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Configure: honor dependencies of dynamic modules.

Browse Source 
Dependencies of dynamic modules are added to NGX_ADDON_DEPS (and
it is now used for dynamic modules) to be in line with what happens
in case of static compilation.

To avoid duplication, MAIL_DEPS and STREAM_DEPS are no longer passed
to auto/module when these modules are compiled as dynamic ones.  Mail
and stream dependencies are handled explicitly via corresponding
variables.
This commit is contained in:
Maxim Dounin 2016-11-21 16:49:19 +03:00
parent a91f2b0382
commit 4c6e31a857
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
auto/make
View File

@ -156,7 +156,7 @@ fi
ngx_all_srcs="$ngx_all_srcs $MISC_SRCS" ngx_all_srcs="$ngx_all_srcs $MISC_SRCS"
if test -n "$NGX_ADDON_SRCS"; then if test -n "$NGX_ADDON_SRCS$DYNAMIC_MODULES"; then
cat << END >> $NGX_MAKEFILE cat << END >> $NGX_MAKEFILE
@ -499,17 +499,6 @@ else
ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)" ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)"
fi fi
ngx_obj_deps="\$(CORE_DEPS)"
if [ $HTTP != NO ]; then
ngx_obj_deps="$ngx_obj_deps \$(HTTP_DEPS)"
fi
if [ $MAIL != NO ]; then
ngx_obj_deps="$ngx_obj_deps \$(MAIL_DEPS)"
fi
if [ $STREAM != NO ]; then
ngx_obj_deps="$ngx_obj_deps \$(STREAM_DEPS)"
fi
for ngx_module in $DYNAMIC_MODULES for ngx_module in $DYNAMIC_MODULES
do do
eval ngx_module_srcs="\$${ngx_module}_SRCS" eval ngx_module_srcs="\$${ngx_module}_SRCS"
@ -665,7 +654,7 @@ END
cat << END >> $NGX_MAKEFILE cat << END >> $NGX_MAKEFILE
$ngx_obj: $ngx_obj_deps$ngx_cont$ngx_src $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src
$ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX $ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
END END
@ -673,7 +662,7 @@ END
cat << END >> $NGX_MAKEFILE cat << END >> $NGX_MAKEFILE
$ngx_obj: $ngx_obj_deps$ngx_cont$ngx_src $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src
$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
END END

4
auto/module
View File

@ -35,6 +35,10 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
CORE_INCS="$CORE_INCS $ngx_module_incs" CORE_INCS="$CORE_INCS $ngx_module_incs"
fi fi
if test -n "$ngx_module_deps"; then
NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_module_deps"
fi
libs= libs=
for lib in $ngx_module_libs for lib in $ngx_module_libs
do do

4
auto/modules
View File

@ -1252,7 +1252,7 @@ if [ $MAIL != NO ]; then
elif [ $MAIL = DYNAMIC ]; then elif [ $MAIL = DYNAMIC ]; then
ngx_module_name=$MAIL_MODULES ngx_module_name=$MAIL_MODULES
ngx_module_incs= ngx_module_incs=
ngx_module_deps=$MAIL_DEPS ngx_module_deps=
ngx_module_srcs=$MAIL_SRCS ngx_module_srcs=$MAIL_SRCS
ngx_module_libs= ngx_module_libs=
ngx_module_link=DYNAMIC ngx_module_link=DYNAMIC
@ -1272,7 +1272,7 @@ if [ $STREAM != NO ]; then
elif [ $STREAM = DYNAMIC ]; then elif [ $STREAM = DYNAMIC ]; then
ngx_module_name=$STREAM_MODULES ngx_module_name=$STREAM_MODULES
ngx_module_incs= ngx_module_incs=
ngx_module_deps=$STREAM_DEPS ngx_module_deps=
ngx_module_srcs=$STREAM_SRCS ngx_module_srcs=$STREAM_SRCS
ngx_module_libs= ngx_module_libs=
ngx_module_link=DYNAMIC ngx_module_link=DYNAMIC