186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

feature: fixed compatibility with macOS 11.15+.

Browse Source 
bumped version to 1.17.8.1 RC1.

win32/win64: upgraded pcre to 8.44 and openssl to 1.1.1d.
This commit is contained in:
Yichun Zhang (agentzh)
2020-03-19 14:15:16 -07:00
parent 721d7dacc4
commit 2ac0ad9f03
4 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/build-win32.sh
View File

@ -1,13 +1,13 @@
#!/bin/bash
PCRE=pcre-8.43
PCRE=pcre-8.44
ZLIB=zlib-1.2.11
OPENSSL=openssl-1.1.0k
OPENSSL=openssl-1.1.1d
JOBS=12
# wget https://www.openssl.org/source/openssl-1.1.0k.tar.gz
# wget https://www.openssl.org/source/openssl-1.1.1d.tar.gz
# wget http://zlib.net/zlib-1.2.11.tar.gz
# wget https://ftp.pcre.org/pub/pcre/pcre-8.43.tar.gz
# wget https://ftp.pcre.org/pub/pcre/pcre-8.44.tar.gz
rm -rf objs || exit 1
mkdir -p objs/lib || exit 1

17
util/configure vendored
View File

@ -775,6 +775,12 @@ int main(void) {
}
}
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
$luajit_xcflags .= " -fno-stack-check";
}
if ($opts->{debug}) {
$luajit_xcflags .= " -DLUA_USE_APICHECK -DLUA_USE_ASSERT";
@ -819,13 +825,18 @@ int main(void) {
if ($platform eq 'macosx') {
my $v = $ENV{MACOSX_DEPLOYMENT_TARGET};
if (!defined $v || $v !~ /^\d+\.\d+$/) {
if (!defined($v) || $v !~ /^\d+\.\d+$/) {
$v = `sw_vers -productVersion`;
if (defined $v && $v =~ /^\s*(\d+\.\d+)/) {
$ENV{MACOSX_DEPLOYMENT_TARGET} = $1;
chomp $v;
if (defined($v) && $v =~ /^\s*(\d+\.\d+)/) {
$v = $1;
$ENV{MACOSX_DEPLOYMENT_TARGET} = $v;
#warn "MACOSX_DEPLOYMENT_TARGET = $1";
}
}
if ($v) {
$extra_opts .= " MACOSX_DEPLOYMENT_TARGET='$v'";
}
}
if (defined $cores) {

2
util/ver
View File

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