Merge branch 'openresty:master' into master
This commit is contained in:
commit
0a443848ea
|
@ -113,17 +113,14 @@ env:
|
|||
- OPENSSL_INC=$OPENSSL_PREFIX/include
|
||||
- OPENRESTY_PREFIX=/opt/openresty
|
||||
jobs:
|
||||
- OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
|
||||
- OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
- OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- <<: *linux-s390x
|
||||
env: OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
|
||||
- <<: *linux-s390x
|
||||
env: OPENSSL_VER=1.1.1l OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
env: OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
- <<: *linux-ppc64le
|
||||
env: OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
env: OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
|
||||
install:
|
||||
- cpanm --sudo --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
|
||||
|
|
2273
t/000-sanity.t
2273
t/000-sanity.t
File diff suppressed because it is too large
Load Diff
|
@ -554,9 +554,6 @@ _END_
|
|||
"\n";
|
||||
}
|
||||
|
||||
# disable pcre2 by default
|
||||
push @ngx_opts, '--without-pcre2';
|
||||
|
||||
if (!$opts->{no_stream}
|
||||
&& ! $opts->{no_stream_ssl}
|
||||
&& ! $opts->{stream_ssl})
|
||||
|
@ -779,8 +776,8 @@ _END_
|
|||
}
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL_X='$root_dir/build/install -m 0755' " .
|
||||
"INSTALL_F='$root_dir/build/install -m 0644'";
|
||||
$extra_opts .= " INSTALL_X='\$(INSTALL) -m 0755' " .
|
||||
"INSTALL_F='\$(INSTALL) -m 0644'";
|
||||
}
|
||||
|
||||
if (defined $cc) {
|
||||
|
@ -953,7 +950,7 @@ _EOC_
|
|||
}
|
||||
|
||||
if ($on_solaris) {
|
||||
#$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
#$extra_opts .= " INSTALL='\$(INSTALL)'";
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .=
|
||||
" CJSON_CFLAGS=\"-g -O -fpic -DUSE_INTERNAL_ISINF\"";
|
||||
|
@ -997,7 +994,7 @@ _EOC_
|
|||
"LUA_LIB_DIR=$lualib_prefix";
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
$extra_opts .= " INSTALL='\$(INSTALL)'";
|
||||
}
|
||||
|
||||
if ($opts->{debug}) {
|
||||
|
@ -1050,7 +1047,7 @@ _EOC_
|
|||
}
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
$extra_opts .= " INSTALL='\$(INSTALL)'";
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .= " CFLAGS=\"-g -O -Wall\"";
|
||||
}
|
||||
|
@ -1101,7 +1098,7 @@ _EOC_
|
|||
}
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
$extra_opts .= " INSTALL='\$(INSTALL)'";
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .= " CFLAGS=\"-g -O -Wall\"";
|
||||
|
||||
|
@ -1149,8 +1146,10 @@ _EOC_
|
|||
} else {
|
||||
$target_dir = "\$(DESTDIR)$prefix/bin/";
|
||||
}
|
||||
push @make_install_cmds, "cd $root_dir/build/$opm_dir && "
|
||||
. "$root_dir/build/install bin/* $target_dir";
|
||||
push @make_install_cmds,
|
||||
"mkdir '$target_dir'",
|
||||
"cd $root_dir/build/$opm_dir && "
|
||||
. "\$(INSTALL) bin/* '$target_dir'";
|
||||
}
|
||||
|
||||
# configure resty-cli:
|
||||
|
@ -1164,7 +1163,7 @@ _EOC_
|
|||
$target_dir = "\$(DESTDIR)$prefix/bin/";
|
||||
}
|
||||
push @make_install_cmds, "cd $root_dir/build/$resty_cli_dir && "
|
||||
. "$root_dir/build/install bin/* $target_dir";
|
||||
. "\$(INSTALL) bin/* $target_dir";
|
||||
|
||||
if ($platform ne 'msys') {
|
||||
# patch the resty script:
|
||||
|
@ -1247,7 +1246,7 @@ sub add_lua_lib ($$$) {
|
|||
|
||||
my $extra_opts =
|
||||
" DESTDIR=\$(DESTDIR) LUA_LIB_DIR=$lualib_prefix"
|
||||
." INSTALL=$root_dir/build/install";
|
||||
." INSTALL='\$(INSTALL)'";
|
||||
|
||||
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
||||
"\$(MAKE) install$extra_opts";
|
||||
|
@ -1560,7 +1559,12 @@ sub gen_makefile {
|
|||
print $out "DESTDIR ?= $root_dir/\n\n";
|
||||
}
|
||||
|
||||
print $out ".PHONY: all install clean\n\n";
|
||||
print $out <<_EOC_;
|
||||
INSTALL := $root_dir/build/install
|
||||
|
||||
.PHONY: all install clean
|
||||
|
||||
_EOC_
|
||||
|
||||
print $out "all:\n\t" . join("\n\t", @make_cmds) . "\n\n";
|
||||
|
||||
|
|
Loading…
Reference in New Issue