bugfix: ./configure: --with-pcre=PATH did not accept relative path in PATH. thanks smallfish for reporting this issue.
This commit is contained in:
agentzh (Yichun Zhang)
parent
7265b0920d
commit
b447ec474e
67
t/sanity.t
67
t/sanity.t
|
|
@ -202,7 +202,6 @@ Options directly inherited from nginx
|
|||
|
||||
|
||||
|
||||
|
||||
=== TEST 2: default
|
||||
--- cmd: ./configure --dry-run
|
||||
--- out
|
||||
|
|
@ -911,7 +910,6 @@ Options directly inherited from nginx
|
|||
|
||||
|
||||
|
||||
|
||||
=== TEST 12: default on solaris
|
||||
--- cmd: ./configure --dry-run --platform=solaris
|
||||
--- out
|
||||
|
|
@ -2870,3 +2868,68 @@ install: all
|
|||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
||||
|
||||
=== TEST 47: relative path as the --with-pcre option's value
|
||||
--- cmd: ./configure --with-pcre=../some/module/ --dry-run
|
||||
--- out
|
||||
platform: linux (linux)
|
||||
cp -rp bundle/ build
|
||||
cd build
|
||||
cd lua-5.1.5
|
||||
gmake linux
|
||||
gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
|
||||
export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib'
|
||||
export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
|
||||
cd ..
|
||||
cd nginx-1.2.4
|
||||
./configure --prefix=/usr/local/openresty/nginx \
|
||||
--add-module=../ngx_devel_kit-0.2.17 \
|
||||
--add-module=../echo-nginx-module-0.41 \
|
||||
--add-module=../xss-nginx-module-0.03rc9 \
|
||||
--add-module=../ngx_coolkit-0.2rc1 \
|
||||
--add-module=../set-misc-nginx-module-0.22rc8 \
|
||||
--add-module=../form-input-nginx-module-0.07rc5 \
|
||||
--add-module=../encrypted-session-nginx-module-0.02 \
|
||||
--add-module=../srcache-nginx-module-0.16 \
|
||||
--add-module=../ngx_lua-0.7.4 \
|
||||
--add-module=../headers-more-nginx-module-0.18 \
|
||||
--add-module=../array-var-nginx-module-0.03rc1 \
|
||||
--add-module=../memc-nginx-module-0.13rc3 \
|
||||
--add-module=../redis2-nginx-module-0.09 \
|
||||
--add-module=../redis-nginx-module-0.3.6 \
|
||||
--add-module=../auth-request-nginx-module-0.2 \
|
||||
--add-module=../rds-json-nginx-module-0.12rc10 \
|
||||
--add-module=../rds-csv-nginx-module-0.05rc2 \
|
||||
--with-pcre=$OPENRESTY_DIR/../some/module --with-http_ssl_module
|
||||
cd ../..
|
||||
Type the following commands to build and install:
|
||||
gmake
|
||||
gmake install
|
||||
|
||||
--- makefile
|
||||
.PHONY: all install clean
|
||||
|
||||
all:
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.5 && $(MAKE) linux
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.10 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.05 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.2.4 && $(MAKE)
|
||||
|
||||
install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-5.1.5 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.10 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.05 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-dns-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-memcached-0.10 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-redis-0.15 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-mysql-0.11 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-string-0.07 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-upload-0.04 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL=$OPENRESTY_BUILD_DIR/install
|
||||
cd $OPENRESTY_BUILD_DIR/nginx-1.2.4 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
|
|
|||
|
|
@ -243,6 +243,11 @@ for my $opt (@ARGV) {
|
|||
my $path = File::Spec->rel2abs($1);
|
||||
push @ngx_opts, "--with-openssl=$path";
|
||||
|
||||
} elsif ($opt =~ /^--with-pcre=(.*)/) {
|
||||
|
||||
my $path = File::Spec->rel2abs($1);
|
||||
push @ngx_opts, "--with-pcre=$path";
|
||||
|
||||
} elsif ($opt =~ /^--\w.*/) {
|
||||
push @ngx_opts, $opt;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue