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

configure: removed dead code since PUC-Lua isn't supported anymore.

Browse Source
pull/602/head
Thibault Charbonnier 5 years ago
parent 47c46ecf87
commit 645ace04e5
2 changed files with 10 additions and 67 deletions
Show Stats Download Patch File Download Diff File

16
t/000-sanity.t
Unescape Escape View File

@ -1416,8 +1416,8 @@ install: all
clean:
rm -rf build *.exe *.dll openresty-*
--- err
Can't exec "gcc-4.2": No such file or directory at ./configure line 710.
Can't exec "gcc-4.2": No such file or directory at ./configure line 755.
Can't exec "gcc-4.2": No such file or directory at ./configure line 708.
Can't exec "gcc-4.2": No such file or directory at ./configure line 753.
@ -1597,8 +1597,8 @@ install: all
clean:
rm -rf build *.exe *.dll openresty-*
--- err
Can't exec "cl": No such file or directory at ./configure line 710.
Can't exec "cl": No such file or directory at ./configure line 755.
Can't exec "cl": No such file or directory at ./configure line 708.
Can't exec "cl": No such file or directory at ./configure line 753.
@ -2441,8 +2441,8 @@ install: all
clean:
rm -rf build *.exe *.dll openresty-*
--- err
Can't exec "sw_vers": No such file or directory at ./configure line 829.
Use of uninitialized value $v in scalar chomp at ./configure line 830.
Can't exec "sw_vers": No such file or directory at ./configure line 827.
Use of uninitialized value $v in scalar chomp at ./configure line 828.
@ -2532,8 +2532,8 @@ install: all
clean:
rm -rf build *.exe *.dll openresty-*
--- err
Can't exec "sw_vers": No such file or directory at ./configure line 829.
Use of uninitialized value $v in scalar chomp at ./configure line 830.
Can't exec "sw_vers": No such file or directory at ./configure line 827.
Use of uninitialized value $v in scalar chomp at ./configure line 828.

61
util/configure vendored
Unescape Escape View File

@ -555,9 +555,7 @@ _END_
push @ngx_opts, '--with-stream_ssl_preread_module';
}
if (!$opts->{lua}
&& !$opts->{lua_path}
&& (!$opts->{no_http_lua} || !$opts->{no_stream_lua})
if ((!$opts->{no_http_lua} || !$opts->{no_stream_lua})
&& !$opts->{luajit_path})
{
#warn "HIT!";
@ -902,64 +900,9 @@ int main(void) {
}
cd '..';
} elsif ($opts->{lua_path}) {
my $lua_prefix = $opts->{lua_path};
env LUA_LIB => File::Spec->catfile($lua_prefix, "lib");
env LUA_INC => File::Spec->catfile($lua_prefix, "include");
push @ngx_rpaths, File::Spec->catfile($lua_prefix, "lib");
} elsif ($opts->{lua}) {
# build stdandard lua
my $lua_src = auto_complete 'lua';
if (!defined $lua_src) {
die "No lua5 found";
}
my $lua_prefix = File::Spec->catfile($prefix, "lua");
my $lua_root = File::Spec->rel2abs("lua-root");
if (-d $lua_root) {
shell "rm -rf $lua_root";
}
mkdir $lua_root or
die "create create directory lua-root: $!\n";
cd $lua_src;
my $extra_opts = '';
if (defined $cc) {
$extra_opts .= " CC='$cc'";
}
if (defined $cores) {
shell "${make} -j$cores$extra_opts $platform", $dry_run;
} else {
shell "${make}$extra_opts $platform", $dry_run;
}
my $install_top = File::Spec->catfile($lua_root, $lua_prefix);
shell "${make} install$extra_opts INSTALL_TOP=$install_top/", $dry_run;
env LUA_LIB => File::Spec->catfile($lua_root, $lua_prefix, "lib");
env LUA_INC => File::Spec->catfile($lua_root, $lua_prefix, "include");
push @make_cmds,
"cd $root_dir/build/$lua_src && \$(MAKE)$extra_opts $platform";
push @make_install_cmds, "cd $root_dir/build/$lua_src && "
. "\$(MAKE) install$extra_opts INSTALL_TOP=\$(DESTDIR)$lua_prefix";
cd '..';
}
if ($opts->{lua} || $opts->{lua_path}
|| $opts->{luajit} || $opts->{luajit_path})
{
if ($opts->{luajit} || $opts->{luajit_path}) {
# build lua modules
$lualib_prefix = File::Spec->catfile($prefix, "lualib");

Write Preview
Loading…
Cancel
Save