Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Sep 2018 02:13:18 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r479498 - head/www/nginx-devel
Message-ID:  <201809110213.w8B2DIVq085499@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Tue Sep 11 02:13:18 2018
New Revision: 479498
URL: https://svnweb.freebsd.org/changeset/ports/479498

Log:
  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>

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/Makefile.extmod

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Tue Sep 11 01:51:56 2018	(r479497)
+++ head/www/nginx-devel/Makefile	Tue Sep 11 02:13:18 2018	(r479498)
@@ -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

Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod	Tue Sep 11 01:51:56 2018	(r479497)
+++ head/www/nginx-devel/Makefile.extmod	Tue Sep 11 02:13:18 2018	(r479498)
@@ -45,7 +45,7 @@ DYNAMIC_UPSTREAM_GH_TUPLE=	cubicdaiya:ngx_dynamic_upst
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809110213.w8B2DIVq085499>