Compare commits

..

14 Commits

4 changed files with 644 additions and 841 deletions

File diff suppressed because it is too large Load Diff

45
util/configure vendored
View File

@ -739,51 +739,6 @@ _END_
$luajit_xcflags .= " -DLUAJIT_DISABLE_GC64";
}
if (!$user_luajit_xcflags
|| $user_luajit_xcflags !~ /-msse4\.2\b/)
{
# check -msse4.2
my ($out, $cfile) = tempfile("resty-config-XXXXXX",
SUFFIX => '.c', TMPDIR => 1,
UNLINK => 1);
print $out "
int main(void) {
#ifndef __SSE4_2__
# error SSE 4.2 not found
#endif
return 0;
}
";
close $out;
my $ofile = tmpnam();
my $comp = ($cc || 'cc');
my $found;
if (system("$comp -o $ofile -msse4.2 -c $cfile") == 0
&& -s $ofile)
{
unlink $ofile;
if (system("$comp -o $ofile -march=native -c $cfile") == 0
&& -s $ofile)
{
print "INFO: found -msse4.2 in $comp.\n";
$found = 1;
$luajit_xcflags .= " -msse4.2";
}
}
if (-f $ofile) {
unlink $ofile;
}
if (!$found) {
print "WARNING: -msse4.2 not supported in $comp.\n";
}
}
if ($platform eq 'macosx') {
# to work around a bug in the Xcode toolchain in macOS 11.15:
# https://github.com/openresty/homebrew-brew/issues/10

View File

@ -555,7 +555,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.10.18rc4
ver=0.10.19
$root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
@ -569,7 +569,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1
#################################
ver=0.0.9rc3
ver=0.0.9
$root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1
mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1
@ -668,7 +668,7 @@ mv openresty-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
#################################
ver=0.27rc4
ver=0.27
$root/util/get-tarball "https://github.com/openresty/resty-cli/tarball/v$ver" -O resty-cli-$ver.tar.gz || exit 1
tar -xzf resty-cli-$ver.tar.gz || exit 1
mv openresty-resty-cli-* resty-cli-$ver || exit 1
@ -683,7 +683,7 @@ mv openresty-opm-* opm-$ver || exit 1
#################################
ver=2.1-20201012-2
ver=2.1-20201027
$root/util/get-tarball "https://github.com/openresty/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
tar -xzf LuaJIT-$ver.tar.gz || exit 1
mv luajit2-* LuaJIT-$ver || exit 1
@ -748,7 +748,7 @@ mv openresty-lua-resty-redis-* lua-resty-redis-$ver || exit 1
#################################
ver=0.23rc1
ver=0.23
$root/util/get-tarball "https://github.com/openresty/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
mv openresty-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
@ -792,7 +792,7 @@ cd ..
#################################
ver=0.08rc1
ver=0.08
$root/util/get-tarball "https://github.com/openresty/lua-resty-websocket/tarball/v$ver" -O "lua-resty-websocket-$ver.tar.gz" || exit 1
tar -xzf lua-resty-websocket-$ver.tar.gz || exit 1
mv openresty-lua-resty-websocket-* lua-resty-websocket-$ver || exit 1
@ -825,7 +825,7 @@ cd ..
#################################
ver=0.1.20rc3
ver=0.1.21
$root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
tar -xzf lua-resty-core-$ver.tar.gz || exit 1
mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1

View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.19.3
minor_ver=1rc1
minor_ver=1
version=$main_ver.$minor_ver
echo $version