Date: Sat, 5 Mar 2016 18:55:52 +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: r410196 - in head/www/nginx-devel: . files Message-ID: <201603051855.u25ItqCN024949@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sat Mar 5 18:55:52 2016 New Revision: 410196 URL: https://svnweb.freebsd.org/changeset/ports/410196 Log: Enable perl module as dynamic perl, add vendor's patch. Do not bump PORTREVISION because perl module is disabled by default. Added: head/www/nginx-devel/files/patch-perl-as-dynamic-module (contents, props changed) Modified: head/www/nginx-devel/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sat Mar 5 18:29:38 2016 (r410195) +++ head/www/nginx-devel/Makefile Sat Mar 5 18:55:52 2016 (r410196) @@ -514,7 +514,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .if ${PORT_OPTIONS:MHTTP_PERL} CATEGORIES+= perl5 -CONFIGURE_ARGS+=--with-http_perl_module +CONFIGURE_ARGS+=--with-http_perl_module=dynamic USES+= perl5 .endif Added: head/www/nginx-devel/files/patch-perl-as-dynamic-module ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/patch-perl-as-dynamic-module Sat Mar 5 18:55:52 2016 (r410196) @@ -0,0 +1,198 @@ +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/install +--- auto/install Mon Feb 29 18:52:33 2016 +0300 ++++ auto/install Fri Feb 26 14:27:04 2016 +0300 +@@ -3,7 +3,7 @@ + # Copyright (C) Nginx, Inc. + + +-if [ $USE_PERL = YES ]; then ++if [ $USE_PERL != NO ]; then + + cat << END >> $NGX_MAKEFILE + +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/lib/conf +--- auto/lib/conf Mon Feb 29 18:52:33 2016 +0300 ++++ auto/lib/conf Fri Feb 26 14:27:04 2016 +0300 +@@ -66,7 +66,7 @@ + . auto/lib/libgd/conf + fi + +-if [ $USE_PERL = YES ]; then ++if [ $USE_PERL != NO ]; then + . auto/lib/perl/conf + fi + +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/lib/make +--- auto/lib/make Mon Feb 29 18:52:33 2016 +0300 ++++ auto/lib/make Fri Feb 26 14:27:04 2016 +0300 +@@ -27,6 +27,6 @@ + . auto/lib/libatomic/make + fi + +-if [ $USE_PERL = YES ]; then ++if [ $USE_PERL != NO ]; then + . auto/lib/perl/make + fi +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/lib/perl/conf +--- auto/lib/perl/conf Mon Feb 29 18:52:33 2016 +0300 ++++ auto/lib/perl/conf Fri Feb 26 14:27:04 2016 +0300 +@@ -60,8 +60,11 @@ + | sed -e 's/-arch i386//' -e 's/-arch x86_64//'` + fi + +- CORE_LINK="$CORE_LINK $ngx_perl_ldopts" +- LINK_DEPS="$LINK_DEPS $NGX_OBJS/$ngx_perl_module" ++ if [ $USE_PERL = YES ]; then ++ CORE_LINK="$CORE_LINK $ngx_perl_ldopts" ++ fi ++ ++ NGX_LIB_PERL="$ngx_perl_ldopts" + + if test -n "$NGX_PERL_MODULES"; then + have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/lib/perl/make +--- auto/lib/perl/make Mon Feb 29 18:52:33 2016 +0300 ++++ auto/lib/perl/make Fri Feb 26 14:27:04 2016 +0300 +@@ -8,7 +8,10 @@ + + cat << END >> $NGX_MAKEFILE + +-$NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext: \\ ++$NGX_OBJS/src/http/modules/perl/ngx_http_perl_module.o: \\ ++ $NGX_OBJS/$ngx_perl_module ++ ++$NGX_OBJS/$ngx_perl_module: \\ + \$(CORE_DEPS) \$(HTTP_DEPS) \\ + src/http/modules/perl/ngx_http_perl_module.h \\ + $NGX_OBJS/src/http/modules/perl/Makefile +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/make +--- auto/make Mon Feb 29 18:52:33 2016 +0300 ++++ auto/make Fri Feb 26 14:27:04 2016 +0300 +@@ -281,7 +281,7 @@ + ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" + else + ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)" +- ngx_perl_cc="\$(CC) $ngx_compile_opt \$(NGX_PERL_CFLAGS) " ++ ngx_perl_cc="\$(CC) $ngx_compile_opt \$(NGX_PERL_CFLAGS)" + ngx_perl_cc="$ngx_perl_cc \$(CORE_INCS) \$(HTTP_INCS)" + fi + +@@ -494,6 +494,8 @@ + ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" + else + ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) \$(ALL_INCS)" ++ ngx_perl_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(NGX_PERL_CFLAGS)" ++ ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)" + fi + + ngx_obj_deps="\$(CORE_DEPS)" +@@ -639,15 +641,15 @@ + + END + +- for ngx_src in $ngx_module_srcs ++ for ngx_source in $ngx_module_srcs + do +- case "$ngx_src" in ++ case "$ngx_source" in + src/*) +- ngx_obj=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` ++ ngx_obj=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"` + ;; + *) +- ngx_obj="addon/`basename \`dirname $ngx_src\``" +- ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \ ++ ngx_obj="addon/`basename \`dirname $ngx_source\``" ++ ngx_obj=`echo $ngx_obj/\`basename $ngx_source\` \ + | sed -e "s/\//$ngx_regex_dirsep/g"` + ;; + esac +@@ -658,14 +660,25 @@ + -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ + -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` + +- ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` ++ ngx_src=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"` + +- cat << END >> $NGX_MAKEFILE ++ if [ $ngx_source = src/http/modules/perl/ngx_http_perl_module.c ]; then ++ ++ cat << END >> $NGX_MAKEFILE ++ ++$ngx_obj: $ngx_obj_deps$ngx_cont$ngx_src ++ $ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX ++ ++END ++ else ++ ++ cat << END >> $NGX_MAKEFILE + + $ngx_obj: $ngx_obj_deps$ngx_cont$ngx_src + $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX + + END + ++ fi + done + done +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/module +--- auto/module Mon Feb 29 18:52:33 2016 +0300 ++++ auto/module Fri Feb 26 14:27:04 2016 +0300 +@@ -40,7 +40,7 @@ + do + case $lib in + +- LIBXSLT | LIBGD | GEOIP) ++ LIBXSLT | LIBGD | GEOIP | PERL) + libs="$libs \$NGX_LIB_$lib" + + if eval [ "\$USE_${lib}" = NO ] ; then +@@ -48,7 +48,7 @@ + fi + ;; + +- PCRE | OPENSSL | MD5 | SHA1 | ZLIB | PERL) ++ PCRE | OPENSSL | MD5 | SHA1 | ZLIB) + eval USE_${lib}=YES + ;; + +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/modules +--- auto/modules Mon Feb 29 18:52:33 2016 +0300 ++++ auto/modules Fri Feb 26 14:27:04 2016 +0300 +@@ -727,14 +727,12 @@ + . auto/module + fi + +-if [ $HTTP_PERL = YES ]; then +- USE_PERL=YES +- ++if [ $HTTP_PERL != NO ]; then + ngx_module_name=ngx_http_perl_module + ngx_module_incs=src/http/modules/perl + ngx_module_deps=src/http/modules/perl/ngx_http_perl_module.h + ngx_module_srcs=src/http/modules/perl/ngx_http_perl_module.c +- ngx_module_libs= ++ ngx_module_libs=PERL + ngx_module_link=$HTTP_PERL + + . auto/module +diff -r 8e6f34342eb6 -r 39a806ccf21e auto/options +--- auto/options Mon Feb 29 18:52:33 2016 +0300 ++++ auto/options Fri Feb 26 14:27:04 2016 +0300 +@@ -271,6 +271,7 @@ + --without-http_upstream_zone_module) HTTP_UPSTREAM_ZONE=NO ;; + + --with-http_perl_module) HTTP_PERL=YES ;; ++ --with-http_perl_module=dynamic) HTTP_PERL=DYNAMIC ;; + --with-perl_modules_path=*) NGX_PERL_MODULES="$value" ;; + --with-perl=*) NGX_PERL="$value" ;; + +@@ -452,6 +453,7 @@ + disable ngx_http_upstream_zone_module + + --with-http_perl_module enable ngx_http_perl_module ++ --with-http_perl_module=dynamic enable dynamic ngx_http_perl_module + --with-perl_modules_path=PATH set Perl modules path + --with-perl=PATH set perl binary pathname + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603051855.u25ItqCN024949>