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

change: we no longer bundle the standard Lua 5.1 interpreter.

This commit is contained in:
Yichun Zhang (agentzh) 2017-04-08 17:33:18 -07:00
parent da979a620a
commit 1fbcf153e3
3 changed files with 396 additions and 821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1183
t/sanity.t
View File

File diff suppressed because it is too large Load Diff

10
util/configure vendored
View File

@ -168,13 +168,13 @@ for my $opt (@ARGV) {
}
} elsif ($opt eq '--without-lua51') {
undef $resty_opts{lua};
die "ERROR: --without-lua51 is no longer supported.\n";
} elsif ($opt eq '--with-lua51') {
$resty_opts{lua} = 1;
die "ERROR: --with-lua51 is no longer supported.\n";
} elsif ($opt =~ /^--with-lua51=(.*)/) {
$resty_opts{lua_path} = $1;
die "ERROR: --with-lua51=PATH is no longer supported.\n";
} elsif ($opt eq '--without-http_rewrite_module') {
warn "WARNING: ngx_devel_kit is automatically disabled ",
@ -1146,10 +1146,6 @@ _EOC_
--without-lua_resty_lrucache disable the lua-resty-lrucache library
--without-lua_resty_core disable the lua-resty-core library
--with-lua51 enable and build the bundled standard Lua 5.1 interpreter
--without-lua51 disable the bundled standard Lua 5.1 interpreter
--with-lua51=DIR specify the external installation of Lua 5.1 by DIR
--with-luajit enable and build the bundled LuaJIT 2.1 (the default)
--with-luajit=DIR use the external LuaJIT 2.1 installation specified by DIR
--with-luajit-xcflags=FLAGS Specify extra C compiler flags for LuaJIT 2.1

24
util/mirror-tarballs
View File

@ -524,9 +524,9 @@ mv openresty-opm-* opm-$ver || exit 1
#################################
ver=5.1.5
$root/util/get-tarball "http://www.lua.org/ftp/lua-$ver.tar.gz" -O "lua-$ver.tar.gz" || exit 1
tar -xzf lua-$ver.tar.gz || exit 1
#ver=5.1.5
#$root/util/get-tarball "http://www.lua.org/ftp/lua-$ver.tar.gz" -O "lua-$ver.tar.gz" || exit 1
#tar -xzf lua-$ver.tar.gz || exit 1
#$root/util/get-tarball "http://agentzh.org/misc/nginx/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1
@ -536,17 +536,17 @@ tar -xzf lua-$ver.tar.gz || exit 1
#rm "patch-lua-$ver-4" || exit 1
echo "$info_txt applying the makefile_install_fix patch for lua $ver"
patch -p0 < $root/patches/lua-$ver-makefile_install_fix.patch || exit 1
echo
#echo "$info_txt applying the makefile_install_fix patch for lua $ver"
#patch -p0 < $root/patches/lua-$ver-makefile_install_fix.patch || exit 1
#echo
echo "$info_txt applying the disable_lua50_compat patch for lua $ver"
patch -p0 < $root/patches/lua-$ver-disable_lua50_compat.patch || exit 1
echo
#echo "$info_txt applying the disable_lua50_compat patch for lua $ver"
#patch -p0 < $root/patches/lua-$ver-disable_lua50_compat.patch || exit 1
#echo
echo "$info_txt applying the enable_debug_info patch for lua $ver"
patch -p0 < $root/patches/lua-$ver-enable_debug_info.patch || exit 1
echo
#echo "$info_txt applying the enable_debug_info patch for lua $ver"
#patch -p0 < $root/patches/lua-$ver-enable_debug_info.patch || exit 1
#echo
#################################