diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2018-09-10 13:11:12 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2018-09-10 13:11:12 +0000 |
| commit | ce4f70264ae0d02f294cd43745a43b45a8eb4a15 (patch) | |
| tree | d6239727677b93498b4b0788fdfad9f6fc8ffce1 | |
| parent | net/ladvd: Update to 1.1.2 (diff) | |
Some modules depend on other being there before.
For example, devel_kit needs to be there before a few other, so this
fixes, and allow for future fixes of this kind of problem:
configuring additional dynamic modules
adding module in /wrkdirs/usr/ports/www/nginx-full/work/array-var-nginx-module-0.05
error: ngx_devel_kit is required to build ngx_array_var; please put it before ngx_array_var.
PR: 230864
Submitted by: mat
exp-runs by: antoine
Notes
Notes:
svn path=/head/; revision=479404
| -rw-r--r-- | www/nginx/Makefile | 6 | ||||
| -rw-r--r-- | www/nginx/Makefile.extmod | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 2cd878ad4a59..38a4fc023e02 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -197,6 +197,12 @@ _addextmod= add-module CONFIGURE_ARGS+= --with-${mod}${_addbasemod} .endfor +# Some modules depend on other being there before, for example, devel_kit needs +# to be there before a few other. +.for mod in ${FIRST_DSO_EXTMODS} +CONFIGURE_ARGS+= --${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR} +.endfor + .for mod in ${DSO_EXTMODS} CONFIGURE_ARGS+= --${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR} .endfor diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 4583ab414b6b..396d0fb98125 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -45,7 +45,7 @@ DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream DYNAMIC_UPSTREAM_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_inet_slab.c DEVEL_KIT_GH_TUPLE= simpl:ngx_devel_kit:v0.3.0:devel_kit -DEVEL_KIT_VARS= DSO_EXTMODS+=devel_kit +DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit ENCRYPTSESSION_IMPLIES= DEVEL_KIT ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.07:encryptsession |