svn commit: r410152 - in head/www/nginx-devel: . files

Sergey A. Osokin osa at FreeBSD.org
Fri Mar 4 22:37:59 UTC 2016


Author: osa
Date: Fri Mar  4 22:37:57 2016
New Revision: 410152
URL: https://svnweb.freebsd.org/changeset/ports/410152

Log:
  Enable third-party passenger module as dynamic.
  
  Patch obtained from:	https://github.com/phusion/passenger/pull/1764

Added:
  head/www/nginx-devel/files/extra-patch-passenger-src-nginx_module-config   (contents, props changed)
Modified:
  head/www/nginx-devel/Makefile

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Fri Mar  4 21:59:50 2016	(r410151)
+++ head/www/nginx-devel/Makefile	Fri Mar  4 22:37:57 2016	(r410152)
@@ -740,8 +740,9 @@ CONFIGURE_ARGS+=--without-http_rewrite_m
 PASSENGER_VERSION=	5.0.26
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger-build-nginx.rb
+CONFIGURE_ARGS+=--add-dynamic-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger-build-nginx.rb \
+		${PATCHDIR}/extra-patch-passenger-src-nginx_module-config
 .if empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG

Added: head/www/nginx-devel/files/extra-patch-passenger-src-nginx_module-config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-passenger-src-nginx_module-config	Fri Mar  4 22:37:57 2016	(r410152)
@@ -0,0 +1,13 @@
+--- ../passenger-5.0.26/src/nginx_module/config.orig	2016-03-04 17:28:49.527086000 -0500
++++ ../passenger-5.0.26/src/nginx_module/config	2016-03-04 17:29:16.364138000 -0500
+@@ -20,6 +20,10 @@
+     if ! cd $ngx_addon_dir; then
+         exit 1
+     fi
++    if [ "$ngx_module_link" = DYNAMIC ]; then
++        EXTRA_CXXFLAGS="-fPIC"
++        export EXTRA_CXXFLAGS
++    fi
+     if test "x$TRACE" = 1; then
+         if ! rake --trace nginx CACHING=false; then
+             exit 1


More information about the svn-ports-all mailing list