diff options
| author | osa <osa@FreeBSD.org> | 2018-09-11 10:13:18 +0800 |
|---|---|---|
| committer | osa <osa@FreeBSD.org> | 2018-09-11 10:13:18 +0800 |
| commit | 30beef5208176abdca3778a797af3c6ba03982cb (patch) | |
| tree | 2620191703e9cf0a0df386f6b3278169dfcfe93f | |
| parent | 5607e09cf1fbc2d20657bc4a195cc835a4006748 (diff) | |
| download | freebsd-ports-gnome-30beef5208176abdca3778a797af3c6ba03982cb.tar.gz freebsd-ports-gnome-30beef5208176abdca3778a797af3c6ba03982cb.tar.zst freebsd-ports-gnome-30beef5208176abdca3778a797af3c6ba03982cb.zip | |
Merge r479404 from www/nginx.
<Commitlog>
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
</Commitlog>
| -rw-r--r-- | www/nginx-devel/Makefile | 6 | ||||
| -rw-r--r-- | www/nginx-devel/Makefile.extmod | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index f085a13c2619..49a724f6b34d 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/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-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index d488c126acfa..2826c552917e 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -45,7 +45,7 @@ DYNAMIC_UPSTREAM_GH_TUPLE= cubicdaiya:ngx_dynamic_upstream:v0.1.6:dynamic_upstre DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream 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.08:encryptsession |