Permalink
Browse files

Fix patches

  • Loading branch information...
1 parent e6a461d commit 0cb060ce979b5372b66e32abff23ae77dd93a3c1 @catap committed Jul 18, 2011
View
@@ -15,7 +15,7 @@ chdir("$dir/nginx");
my @args = ("--builddir=$dir/objs");
open(MODULES, "<../modules/enable") || die $!;
-my @modules = map {"--add-module=../modules/$_"} grep {/^[^#]+/} <MODULES>;
+my @modules = map {"--add-module=../modules/$_"} grep {/^[^#]+/} grep {! /^$/} <MODULES>;
close(MODULES);
my @fixed_path = map {my $arg = $_; $arg =~ s!\.\./!\.\./\.\./!; $arg} @ARGV;
@@ -178,7 +178,7 @@ Index: nginx-catap/nginx/auto/options
===================================================================
--- nginx-catap.orig/nginx/auto/options
+++ nginx-catap/nginx/auto/options
-@@ -114,7 +114,7 @@ PCRE_OPT=
+@@ -115,7 +115,7 @@ PCRE_OPT=
USE_OPENSSL=NO
OPENSSL=NONE
@@ -2,10 +2,10 @@ Index: nginx-catap/nginx/auto/lib/perl/make
===================================================================
--- nginx-catap.orig/nginx/auto/lib/perl/make
+++ nginx-catap/nginx/auto/lib/perl/make
-@@ -27,6 +27,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile
- && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \
+@@ -28,6 +28,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile
NGX_PCRE=$PCRE \
NGX_OBJS=$NGX_OBJS \
+ NGX_SRC_DIR=$NGX_SRC_DIR \
+ NGX_OPENSSL=$OPENSSL \
$NGX_PERL Makefile.PL \
LIB=$NGX_PERL_MODULES \
@@ -15,15 +15,15 @@ Index: nginx-catap/nginx/src/http/modules/perl/Makefile.PL
--- nginx-catap.orig/nginx/src/http/modules/perl/Makefile.PL
+++ nginx-catap/nginx/src/http/modules/perl/Makefile.PL
@@ -24,7 +24,12 @@ WriteMakefile(
- "-I ../../../../../$ENV{NGX_OBJS} " .
+ "-I $ENV{NGX_OBJS} " .
($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" :
($ENV{NGX_PCRE} =~ m#^/# ? "-I $ENV{NGX_PCRE} " :
-- "-I ../../../../../$ENV{NGX_PCRE} ")),
-+ "-I ../../../../../$ENV{NGX_PCRE} ")) .
+- "-I $ENV{NGX_SRC_DIR}/$ENV{NGX_PCRE} ")),
++ "-I $ENV{NGX_SRC_DIR}/$ENV{NGX_PCRE} ")) .
+ ($ENV{NGX_OPENSSL} =~ /^(YES|NO)/ ? "" :
+ ($ENV{NGX_OPENSSL} =~ m#^/# ?
+ "-I $ENV{NGX_OPENSSL}/.openssl/include " :
-+ "-I ../../../../../$ENV{NGX_OPENSSL}/.openssl/include ")),
++ "-I $ENV{NGX_SRC_DIR}/$ENV{NGX_OPENSSL}/.openssl/include ")),
+
depend => {
View
@@ -25,7 +25,7 @@ Index: nginx-catap/nginx/auto/options
===================================================================
--- nginx-catap.orig/nginx/auto/options
+++ nginx-catap/nginx/auto/options
-@@ -41,6 +41,9 @@ EVENT_SELECT=NO
+@@ -42,6 +42,9 @@ EVENT_SELECT=NO
EVENT_POLL=NO
EVENT_AIO=NO
@@ -35,7 +35,7 @@ Index: nginx-catap/nginx/auto/options
USE_THREADS=NO
NGX_FILE_AIO=NO
-@@ -181,6 +184,10 @@ do
+@@ -182,6 +185,10 @@ do
--without-poll_module) EVENT_POLL=NONE ;;
--with-aio_module) EVENT_AIO=YES ;;
@@ -18,23 +18,23 @@ Index: nginx-catap/nginx/auto/options
===================================================================
--- nginx-catap.orig/nginx/auto/options
+++ nginx-catap/nginx/auto/options
-@@ -97,6 +97,7 @@ HTTP_UPSTREAM_IP_HASH=YES
+@@ -98,6 +98,7 @@ HTTP_UPSTREAM_IP_HASH=YES
# STUB
HTTP_STUB_STATUS=NO
+HTTP_STATUS_HEAP=NO
MAIL=NO
MAIL_SSL=NO
-@@ -240,6 +241,7 @@ do
+@@ -241,6 +242,7 @@ do
# STUB
--with-http_stub_status_module) HTTP_STUB_STATUS=YES ;;
+ --with-http_status_heap_module) HTTP_STATUS_HEAP=YES ;;
--with-mail) MAIL=YES ;;
--with-mail_ssl_module) MAIL_SSL=YES ;;
-@@ -349,6 +351,7 @@ cat << END
+@@ -350,6 +352,7 @@ cat << END
--with-http_secure_link_module enable ngx_http_secure_link_module
--with-http_degradation_module enable ngx_http_degradation_module
--with-http_stub_status_module enable ngx_http_stub_status_module
View
@@ -41,7 +41,7 @@ Index: nginx-catap/nginx/auto/options
===================================================================
--- nginx-catap.orig/nginx/auto/options
+++ nginx-catap/nginx/auto/options
-@@ -141,6 +141,10 @@ NGX_LIBATOMIC=NO
+@@ -142,6 +142,10 @@ NGX_LIBATOMIC=NO
NGX_CPU_CACHE_LINE=
@@ -52,7 +52,7 @@ Index: nginx-catap/nginx/auto/options
opt=
for option
-@@ -281,6 +285,10 @@ do
+@@ -282,6 +286,10 @@ do
--with-libatomic) NGX_LIBATOMIC=YES ;;
--with-libatomic=*) NGX_LIBATOMIC="$value" ;;
@@ -63,7 +63,7 @@ Index: nginx-catap/nginx/auto/options
--test-build-devpoll) NGX_TEST_BUILD_DEVPOLL=YES ;;
--test-build-eventport) NGX_TEST_BUILD_EVENTPORT=YES ;;
--test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;;
-@@ -426,6 +434,10 @@ cat << END
+@@ -427,6 +435,10 @@ cat << END
--with-openssl=DIR set path to OpenSSL library sources
--with-openssl-opt=OPTIONS set additional options for OpenSSL building
@@ -123,7 +123,7 @@ Index: nginx-catap/nginx/auto/options
===================================================================
--- nginx-catap.orig/nginx/auto/options
+++ nginx-catap/nginx/auto/options
-@@ -305,11 +305,11 @@ cat << END
+@@ -306,11 +306,11 @@ cat << END
--help this message
--prefix=PATH set the installation prefix
@@ -139,7 +139,7 @@ Index: nginx-catap/nginx/auto/options
--user=USER set non-privilege user
for the worker processes
-@@ -452,10 +452,10 @@ if [ ".$NGX_PLATFORM" = ".win32" ]; then
+@@ -453,10 +453,10 @@ if [ ".$NGX_PLATFORM" = ".win32" ]; then
fi

0 comments on commit 0cb060c

Please sign in to comment.