flyskype
/
openresty
mirror of https://github.com/openresty/openresty
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added new option -jN (e.g., -j8, -j10, and etc.) to ./configure; thanks @Lance.

Browse Source
pull/4/head
agentzh (章亦春) 14 years ago
parent b8217145ed
commit b5e945fb9f
2 changed files with 173 additions and 30 deletions
Show Stats Download Patch File Download Diff File

181
t/sanity.t
Unescape Escape View File

@ -2,7 +2,7 @@
use t::Config;
plan tests => 143;
plan tests => 151;
#no_diff();
@ -22,6 +22,9 @@ __DATA__
--with-no-pool-patch enable the no-pool patch for debugging memory issues.
-jN pass -jN option to make while building the bundled
Lua 5.1 interpreter or LuaJIT 2.0.
--without-http_echo_module disable ngx_http_echo_module
--without-http_xss_module disable ngx_http_xss_module
--without-http_set_misc_module disable ngx_http_set_misc_module
@ -187,6 +190,7 @@ Options directly inherited from nginx
=== TEST 2: default
--- cmd: ./configure --dry-run
--- out
@ -207,7 +211,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -267,7 +271,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -336,7 +340,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -396,7 +400,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -455,7 +459,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -615,7 +619,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -665,6 +669,9 @@ clean:
--with-no-pool-patch enable the no-pool patch for debugging memory issues.
-jN pass -jN option to make while building the bundled
Lua 5.1 interpreter or LuaJIT 2.0.
--without-http_echo_module disable ngx_http_echo_module
--without-http_xss_module disable ngx_http_xss_module
--without-http_set_misc_module disable ngx_http_set_misc_module
@ -830,6 +837,7 @@ Options directly inherited from nginx
=== TEST 12: default on solaris
--- cmd: ./configure --dry-run --platform=solaris
--- out
@ -850,7 +858,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -909,7 +917,7 @@ cd nginx-1.0.6
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.1.1 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -968,7 +976,7 @@ cd nginx-1.0.6
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.1.1 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1040,7 +1048,7 @@ cd nginx-1.0.6
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../drizzle-nginx-module-0.1.1 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1099,7 +1107,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1159,7 +1167,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1220,7 +1228,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1293,7 +1301,7 @@ cd nginx-1.0.6
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_postgres-0.9rc1 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1353,7 +1361,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1434,7 +1442,7 @@ cd nginx-1.0.6
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_postgres-0.9rc1 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1504,7 +1512,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1562,7 +1570,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1621,7 +1629,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1680,7 +1688,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1738,7 +1746,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1799,7 +1807,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1857,7 +1865,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1913,7 +1921,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1967,7 +1975,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2019,7 +2027,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2083,7 +2091,7 @@ cd nginx-1.0.6
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc3 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2118,3 +2126,120 @@ install:
clean:
rm -rf build
=== TEST 39: ./configure with -jN
--- cmd: ./configure --dry-run -j10
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd lua-5.1.4
gmake -j10 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.0.6
./configure --prefix=/usr/local/openresty/nginx \
--add-module=../ngx_devel_kit-0.2.17 \
--add-module=../echo-nginx-module-0.37rc4 \
--add-module=../xss-nginx-module-0.03rc3 \
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
--add-module=../memc-nginx-module-0.12 \
--add-module=../redis2-nginx-module-0.07 \
--add-module=../upstream-keepalive-nginx-module-0.3 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc5 \
--add-module=../rds-csv-nginx-module-0.03 \
--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.4 && $(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.09rc5 && $(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.03 && $(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.0.6 && $(MAKE)
install:
cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(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.09rc5 && $(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.03 && $(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/nginx-1.0.6 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
rm -rf build
=== TEST 40: --with-luajit & -jN
--- cmd: ./configure --with-luajit --dry-run -j5
--- out
platform: linux (linux)
cp -rp bundle/ build/
cd build
cd LuaJIT-2.0.0-beta8
gmake -j5 TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
gmake install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0'
cd ..
cd nginx-1.0.6
./configure --prefix=/usr/local/openresty/nginx \
--add-module=../ngx_devel_kit-0.2.17 \
--add-module=../echo-nginx-module-0.37rc4 \
--add-module=../xss-nginx-module-0.03rc3 \
--add-module=../set-misc-nginx-module-0.22rc2 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.01 \
--add-module=../ngx_lua-0.3.1rc8 \
--add-module=../headers-more-nginx-module-0.16rc2 \
--add-module=../srcache-nginx-module-0.12 \
--add-module=../array-var-nginx-module-0.03rc1 \
--add-module=../memc-nginx-module-0.12 \
--add-module=../redis2-nginx-module-0.07 \
--add-module=../upstream-keepalive-nginx-module-0.3 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc5 \
--add-module=../rds-csv-nginx-module-0.03 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--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/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.03 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
cd $OPENRESTY_BUILD_DIR/nginx-1.0.6 && $(MAKE)
install:
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd $OPENRESTY_BUILD_DIR/lua-cjson-1.0.3 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.09rc5 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
cd $OPENRESTY_BUILD_DIR/lua-rds-parser-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0 LUA_LIB_DIR=/usr/local/openresty/lualib CC=gcc
cd $OPENRESTY_BUILD_DIR/nginx-1.0.6 && $(MAKE) install DESTDIR=$(DESTDIR)
clean:
rm -rf build

22
util/configure vendored
Unescape Escape View File

@ -110,12 +110,18 @@ my %resty_opts;
my $dry_run;
my @ngx_rpaths;
my $cc;
my $cores;
my (@ngx_opts, @ngx_cc_opts, @ngx_ld_opts);
for my $opt (@ARGV) {
next unless defined $opt;
if ($opt =~ /^-j(\d+)/) {
$cores = $1;
next;
}
if ($opt =~ /^--with-cc=(.+)/) {
$cc = $1;
push @ngx_opts, $opt;
@ -485,7 +491,11 @@ _END_
$extra_opts .= " CC=$cc";
}
shell "${make}$extra_opts PREFIX=$luajit_prefix", $dry_run;
if (defined $cores) {
shell "${make} -j$cores$extra_opts PREFIX=$luajit_prefix", $dry_run;
} else {
shell "${make}$extra_opts PREFIX=$luajit_prefix", $dry_run;
}
shell "${make} install$extra_opts PREFIX=$luajit_prefix DESTDIR=$luajit_root", $dry_run;
@ -535,7 +545,12 @@ _END_
$extra_opts .= " CC=$cc";
}
shell "${make}$extra_opts $platform", $dry_run;
if (defined $cores) {
shell "${make} -j$cores$extra_opts $platform", $dry_run;
} else {
shell "${make}$extra_opts $platform", $dry_run;
}
shell "${make} install$extra_opts INSTALL_TOP=$lua_root$lua_prefix", $dry_run;
env LUA_LIB => "$lua_root$lua_prefix/lib";
@ -750,6 +765,9 @@ sub usage ($) {
--with-no-pool-patch enable the no-pool patch for debugging memory issues.
-jN pass -jN option to make while building the bundled
Lua 5.1 interpreter or LuaJIT 2.0.
_EOC_
my $opt_max_len = length " --without-ngx_devel_kit_module ";

Write Preview
Loading…
Cancel
Save