From 0528788543f00c30f7fea01a6809d2df13636fef Mon Sep 17 00:00:00 2001 From: "Yichun Zhang (agentzh)" Date: Tue, 10 Dec 2013 10:18:15 -0800 Subject: [PATCH] feature: added new configure option --with-pcre-conf-opt=OPTIONS to the nginx core to allow custom PCRE ./configure build options. thanks Lance Li for the original patch in #39. --- patches/nginx-1.4.3-pcre_conf_opt.patch | 26 +++++++++++++++++++++++++ t/sanity.t | 6 ++++-- util/configure | 3 ++- util/mirror-tarballs | 4 ++++ util/ver | 2 +- 5 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 patches/nginx-1.4.3-pcre_conf_opt.patch diff --git a/patches/nginx-1.4.3-pcre_conf_opt.patch b/patches/nginx-1.4.3-pcre_conf_opt.patch new file mode 100644 index 0000000..eb17e06 --- /dev/null +++ b/patches/nginx-1.4.3-pcre_conf_opt.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User Yichun Zhang +# Date 1386694955 28800 +# Node ID 9ba6b149669f1f02eeb4cdc0ebd364a949b5c469 +# Parent 30e806b8636af5fd3f03ec17df24801f390f7511 +Configure: added new option --with-pcre-conf-opt=OPTIONS. + +diff -r 30e806b8636a -r 9ba6b149669f auto/options +--- a/auto/options Mon Dec 09 10:16:44 2013 +0400 ++++ b/auto/options Tue Dec 10 09:02:35 2013 -0800 +@@ -286,6 +286,7 @@ + --with-pcre) USE_PCRE=YES ;; + --with-pcre=*) PCRE="$value" ;; + --with-pcre-opt=*) PCRE_OPT="$value" ;; ++ --with-pcre-conf-opt=*) PCRE_CONF_OPT="$value" ;; + --with-pcre-jit) PCRE_JIT=YES ;; + + --with-openssl=*) OPENSSL="$value" ;; +@@ -441,6 +442,7 @@ + --with-pcre force PCRE library usage + --with-pcre=DIR set path to PCRE library sources + --with-pcre-opt=OPTIONS set additional build options for PCRE ++ --with-pcre-conf-opt=OPTIONS set additional configure options for PCRE + --with-pcre-jit build PCRE with JIT compilation support + + --with-md5=DIR set path to md5 library sources diff --git a/t/sanity.t b/t/sanity.t index d2a8ac1..54ff4fb 100644 --- a/t/sanity.t +++ b/t/sanity.t @@ -176,7 +176,8 @@ Options directly inherited from nginx --without-pcre disable PCRE library usage --with-pcre force PCRE library usage --with-pcre=DIR set path to PCRE library sources - --with-pcre-opt=OPTIONS set additional options for PCRE building + --with-pcre-opt=OPTIONS set additional make options for PCRE + --with-pcre-conf-opt=OPTIONS set additional configure options for PCRE --with-pcre-jit build PCRE with JIT compilation support --with-md5=DIR set path to md5 library sources @@ -900,7 +901,8 @@ Options directly inherited from nginx --without-pcre disable PCRE library usage --with-pcre force PCRE library usage --with-pcre=DIR set path to PCRE library sources - --with-pcre-opt=OPTIONS set additional options for PCRE building + --with-pcre-opt=OPTIONS set additional make options for PCRE + --with-pcre-conf-opt=OPTIONS set additional configure options for PCRE --with-pcre-jit build PCRE with JIT compilation support --with-md5=DIR set path to md5 library sources diff --git a/util/configure b/util/configure index 945c47d..d7be81e 100755 --- a/util/configure +++ b/util/configure @@ -1025,7 +1025,8 @@ Options directly inherited from nginx --without-pcre disable PCRE library usage --with-pcre force PCRE library usage --with-pcre=DIR set path to PCRE library sources - --with-pcre-opt=OPTIONS set additional options for PCRE building + --with-pcre-opt=OPTIONS set additional make options for PCRE + --with-pcre-conf-opt=OPTIONS set additional configure options for PCRE --with-pcre-jit build PCRE with JIT compilation support --with-md5=DIR set path to md5 library sources diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 45749ec..c9481f7 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -214,6 +214,10 @@ echo "$info_txt applying the larger_max_error_str patch for nginx $ver" patch -p1 < $root/patches/nginx-$ver-larger_max_error_str.patch || exit 1 echo +echo "$info_txt applying the pcre_conf_opt patch for nginx $ver" +patch -p1 < $root/patches/nginx-$ver-pcre_conf_opt.patch || exit 1 +echo + rm -f *.patch || exit 1 cd .. || exit 1 diff --git a/util/ver b/util/ver index ce5fe8b..d2b061f 100755 --- a/util/ver +++ b/util/ver @@ -2,7 +2,7 @@ #main_ver=1.5.4 main_ver=1.4.3 -minor_ver=6 +minor_ver=7rc1 version=$main_ver.$minor_ver echo $version