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

./configure: fixed source lines exceeding 80 cols (heredoc literals are skipped).

This commit is contained in:
Yichun Zhang (agentzh) 2018-03-18 12:42:07 -07:00
parent 46a1c7adb3
commit 4a85469797
2 changed files with 62 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/sanity.t
View File

@ -1351,8 +1351,8 @@ install: all
clean: clean:
rm -rf build rm -rf build
--- err --- err
Can't exec "gcc-4.2": No such file or directory at ./configure line 629. Can't exec "gcc-4.2": No such file or directory at ./configure line 639.
Can't exec "gcc-4.2": No such file or directory at ./configure line 667. Can't exec "gcc-4.2": No such file or directory at ./configure line 677.
@ -1524,8 +1524,8 @@ install: all
clean: clean:
rm -rf build rm -rf build
--- err --- err
Can't exec "cl": No such file or directory at ./configure line 629. Can't exec "cl": No such file or directory at ./configure line 639.
Can't exec "cl": No such file or directory at ./configure line 667. Can't exec "cl": No such file or directory at ./configure line 677.
@ -2332,7 +2332,7 @@ install: all
clean: clean:
rm -rf build rm -rf build
--- err --- err
Can't exec "sw_vers": No such file or directory at ./configure line 726. Can't exec "sw_vers": No such file or directory at ./configure line 740.
@ -2418,7 +2418,7 @@ install: all
clean: clean:
rm -rf build rm -rf build
--- err --- err
Can't exec "sw_vers": No such file or directory at ./configure line 726. Can't exec "sw_vers": No such file or directory at ./configure line 740.

81
util/configure vendored
View File

@ -369,7 +369,8 @@ push @make_install_cmds,
. " \$(DESTDIR)$prefix/site/manifest"; . " \$(DESTDIR)$prefix/site/manifest";
if ($platform ne 'msys') { if ($platform ne 'msys') {
push @make_install_cmds, "ln -sf $ngx_sbin \$(DESTDIR)$prefix/bin/openresty"; push @make_install_cmds,
"ln -sf $ngx_sbin \$(DESTDIR)$prefix/bin/openresty";
} }
cd '../..'; # to the root cd '../..'; # to the root
@ -468,10 +469,12 @@ Type the following commands to build and install:
_END_ _END_
if ($opts->{no_ndk}) { if ($opts->{no_ndk}) {
for my $name (qw(set_misc iconv lz_session form_input array_var encrypted_session)) { for my $name (qw(set_misc iconv lz_session form_input array_var
encrypted_session))
{
if (! $opts->{"no_http_$name"}) { if (! $opts->{"no_http_$name"}) {
warn "WARNING: ngx_http_${name}_module is automatically disabled ", warn "WARNING: ngx_http_${name}_module is automatically ",
"because ngx_devel_kit_module is disabled.\n"; "disabled because ngx_devel_kit_module is disabled.\n";
$opts->{"no_http_$name"} = 1; $opts->{"no_http_$name"} = 1;
} }
} }
@ -497,7 +500,8 @@ _END_
} }
if ($opts->{no_http_ssl} && $opts->{http_ssl}) { if ($opts->{no_http_ssl} && $opts->{http_ssl}) {
die "--with-http_ssl_module conflicts with --without-http_ssl_module.\n"; die "--with-http_ssl_module conflicts with --without-http_ssl_module.",
"\n";
} }
if (! $opts->{no_http_ssl} && ! $opts->{http_ssl}) { if (! $opts->{no_http_ssl} && ! $opts->{http_ssl}) {
@ -506,25 +510,30 @@ _END_
} }
if (! $opts->{http_drizzle} && $opts->{libdrizzle}) { if (! $opts->{http_drizzle} && $opts->{libdrizzle}) {
die "The http_drizzle_module is not enabled while --with-libdrizzle is specified.\n"; die "The http_drizzle_module is not enabled while --with-libdrizzle ",
"is specified.\n";
} }
if (! $opts->{http_postgres} && $opts->{libpq}) { if (! $opts->{http_postgres} && $opts->{libpq}) {
die "The http_postgres_module is not enabled while --with-libpq is specified.\n"; die "The http_postgres_module is not enabled while --with-libpq is ",
"specified.\n";
} }
if (! $opts->{http_postgres} && $opts->{pg_config}) { if (! $opts->{http_postgres} && $opts->{pg_config}) {
die "The http_postgres_module is not enabled while --with-pg_config is specified.\n"; die "The http_postgres_module is not enabled while --with-pg_config ",
"is specified.\n";
} }
if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) { if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) {
die "you need to have ldconfig in your PATH env when enabling luajit.\n"; die "you need to have ldconfig in your PATH env when enabling luajit.",
"\n";
} }
my $opts_line = ''; my $opts_line = '';
if ($opts->{debug}) { if ($opts->{debug}) {
unshift @ngx_cc_opts, '-DNGX_LUA_USE_ASSERT', '-DNGX_LUA_ABORT_AT_PANIC'; unshift @ngx_cc_opts, '-DNGX_LUA_USE_ASSERT',
'-DNGX_LUA_ABORT_AT_PANIC';
$opts_line .= " \\\n --with-debug"; $opts_line .= " \\\n --with-debug";
} else { } else {
@ -537,7 +546,8 @@ _END_
} }
if (-e 'build') { if (-e 'build') {
die "file or directory \"build\" already exists. please remove it first.\n"; die "file or directory \"build\" already exists. please remove it ",
"first.\n";
} }
shell "cp -rp bundle/ build"; shell "cp -rp bundle/ build";
@ -664,10 +674,14 @@ int main(void) {
my $comp = ($cc || 'cc'); my $comp = ($cc || 'cc');
my $found; my $found;
if (system("$comp -o $ofile -msse4.2 -c $cfile") == 0 && -s $ofile) { if (system("$comp -o $ofile -msse4.2 -c $cfile") == 0
&& -s $ofile)
{
unlink $ofile; unlink $ofile;
if (system("$comp -o $ofile -march=native -c $cfile") == 0 && -s $ofile) { if (system("$comp -o $ofile -march=native -c $cfile") == 0
&& -s $ofile)
{
print "INFO: found -msse4.2 in $comp.\n"; print "INFO: found -msse4.2 in $comp.\n";
$found = 1; $found = 1;
$luajit_xcflags .= " -msse4.2"; $luajit_xcflags .= " -msse4.2";
@ -741,7 +755,8 @@ int main(void) {
if ($platform eq 'msys') { if ($platform eq 'msys') {
$lib = $luajit_root; $lib = $luajit_root;
shell "install -m 0755 src/luajit.exe src/lua51.dll $lib/", $dry_run; shell "install -m 0755 src/luajit.exe src/lua51.dll $lib/",
$dry_run;
my $lua_jit_dir = File::Spec->catfile($luajit_root, "lua", "jit"); my $lua_jit_dir = File::Spec->catfile($luajit_root, "lua", "jit");
shell "mkdir -p $lua_jit_dir", $dry_run; shell "mkdir -p $lua_jit_dir", $dry_run;
@ -751,20 +766,26 @@ int main(void) {
$inc = File::Spec->catfile($luajit_root, "include", "luajit-2.1"); $inc = File::Spec->catfile($luajit_root, "include", "luajit-2.1");
shell "mkdir -p $inc", $dry_run; shell "mkdir -p $inc", $dry_run;
shell "cd src && install -m 0644 lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h $inc/", shell "cd src && install -m 0644 lua.h lualib.h lauxlib.h "
. "luaconf.h lua.hpp luajit.h $inc/",
$dry_run; $dry_run;
} else { } else {
shell "${make} install$extra_opts PREFIX=$luajit_prefix DESTDIR=$luajit_root/", $dry_run; shell "${make} install$extra_opts PREFIX=$luajit_prefix "
. "DESTDIR=$luajit_root/", $dry_run;
$lib = File::Spec->catfile($luajit_root, $luajit_prefix, "lib"); $lib = File::Spec->catfile($luajit_root, $luajit_prefix, "lib");
$inc = File::Spec->catfile($luajit_root, $luajit_prefix, "include", "luajit-2.1"); $inc = File::Spec->catfile($luajit_root, $luajit_prefix,
"include", "luajit-2.1");
} }
push @make_cmds, "cd $root_dir/build/$luajit_src && " push @make_cmds, "cd $root_dir/build/$luajit_src && "
. "\$(MAKE)$extra_opts PREFIX=$luajit_prefix"; . "\$(MAKE)$extra_opts PREFIX=$luajit_prefix";
my $abs_luajit_src = File::Spec->rel2abs(File::Spec->catfile($root_dir, "build", $luajit_src), $root_dir); my $abs_luajit_src =
File::Spec->rel2abs(File::Spec->catfile($root_dir, "build",
$luajit_src),
$root_dir);
if ($platform eq 'msys') { if ($platform eq 'msys') {
push @make_install_cmds, "cd $abs_luajit_src && " push @make_install_cmds, "cd $abs_luajit_src && "
@ -772,7 +793,8 @@ int main(void) {
} else { } else {
push @make_install_cmds, "cd $abs_luajit_src && " push @make_install_cmds, "cd $abs_luajit_src && "
. "\$(MAKE) install$extra_opts PREFIX=$luajit_prefix DESTDIR=\$(DESTDIR)"; . "\$(MAKE) install$extra_opts PREFIX=$luajit_prefix "
. "DESTDIR=\$(DESTDIR)";
} }
env LUAJIT_LIB => $lib; env LUAJIT_LIB => $lib;
@ -832,7 +854,8 @@ int main(void) {
env LUA_LIB => File::Spec->catfile($lua_root, $lua_prefix, "lib"); env LUA_LIB => File::Spec->catfile($lua_root, $lua_prefix, "lib");
env LUA_INC => File::Spec->catfile($lua_root, $lua_prefix, "include"); 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_cmds,
"cd $root_dir/build/$lua_src && \$(MAKE)$extra_opts $platform";
push @make_install_cmds, "cd $root_dir/build/$lua_src && " push @make_install_cmds, "cd $root_dir/build/$lua_src && "
. "\$(MAKE) install$extra_opts INSTALL_TOP=\$(DESTDIR)$lua_prefix"; . "\$(MAKE) install$extra_opts INSTALL_TOP=\$(DESTDIR)$lua_prefix";
@ -883,16 +906,19 @@ _EOC_
if ($platform eq 'msys') { if ($platform eq 'msys') {
my $luajit_root = File::Spec->rel2abs("luajit-root"); my $luajit_root = File::Spec->rel2abs("luajit-root");
$extra_opts .= " CJSON_LDFLAGS=\"-shared -L$luajit_root -llua51\""; $extra_opts .=
" CJSON_LDFLAGS=\"-shared -L$luajit_root -llua51\"";
} }
if ($on_solaris) { if ($on_solaris) {
#$extra_opts .= " INSTALL=$root_dir/build/install"; #$extra_opts .= " INSTALL=$root_dir/build/install";
if ($opts->{debug}) { if ($opts->{debug}) {
$extra_opts .= " CJSON_CFLAGS=\"-g -O -fpic -DUSE_INTERNAL_ISINF\""; $extra_opts .=
" CJSON_CFLAGS=\"-g -O -fpic -DUSE_INTERNAL_ISINF\"";
} else { } else {
$extra_opts .= " CJSON_CFLAGS=\"-g -fpic -DUSE_INTERNAL_ISINF\""; $extra_opts .=
" CJSON_CFLAGS=\"-g -fpic -DUSE_INTERNAL_ISINF\"";
} }
} else { } else {
@ -904,7 +930,8 @@ _EOC_
} }
if ($platform eq 'macosx') { if ($platform eq 'macosx') {
$extra_opts .= " CJSON_LDFLAGS='-bundle -undefined dynamic_lookup'"; $extra_opts .=
" CJSON_LDFLAGS='-bundle -undefined dynamic_lookup'";
} }
if (defined $cc) { if (defined $cc) {
@ -1034,7 +1061,8 @@ _EOC_
die "No $name found"; die "No $name found";
} }
my $extra_opts = " DESTDIR=\$(DESTDIR) LUA_LIB_DIR=$lualib_prefix" my $extra_opts =
" DESTDIR=\$(DESTDIR) LUA_LIB_DIR=$lualib_prefix"
." INSTALL=$root_dir/build/install"; ." INSTALL=$root_dir/build/install";
push @make_install_cmds, "cd $root_dir/build/$dir && " . push @make_install_cmds, "cd $root_dir/build/$dir && " .
@ -1104,7 +1132,8 @@ _EOC_
# configure restydoc indexes # configure restydoc indexes
push @make_install_cmds, "cp $root_dir/build/resty.index \$(DESTDIR)$prefix/", push @make_install_cmds,
"cp $root_dir/build/resty.index \$(DESTDIR)$prefix/",
"cp -r $root_dir/build/pod \$(DESTDIR)$prefix/"; "cp -r $root_dir/build/pod \$(DESTDIR)$prefix/";
# prepare nginx configure line # prepare nginx configure line