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

bugfix: added an openssl patch to fix the parallel build regression in openssl 1.1.0j.

This commit is contained in:
Yichun Zhang (agentzh) 2019-03-02 01:17:57 -08:00
parent 083403fb43
commit ed32897702
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/openssl-1.1.0j-parallel_build_fix.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 11fecc259b..50362d3812 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -77,8 +77,14 @@
# to. You're welcome.
sub dependmagic {
my $target = shift;
-
- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
+ my $magic = <<"_____";
+$target: build_generated depend
+\t\$(MAKE) _$target
+_$target
+_____
+ # Remove line ending
+ $magic =~ s|\R$||;
+ return $magic;
}
'';
-}

1
util/build-win32.sh
View File

@ -19,6 +19,7 @@ tar -xf ../../../$PCRE.tar.gz || exit 1
cd ../.. cd ../..
cd objs/lib/$OPENSSL || exit 1 cd objs/lib/$OPENSSL || exit 1
patch -p1 < ../../../patches/openssl-1.1.0j-parallel_build_fix.patch || exit 1
patch -p1 < ../../../patches/openssl-1.1.0d-sess_set_get_cb_yield.patch \ patch -p1 < ../../../patches/openssl-1.1.0d-sess_set_get_cb_yield.patch \
|| exit 1 || exit 1
cd ../../.. cd ../../..

1
util/mirror-tarballs
View File

@ -897,6 +897,7 @@ cp $root/COPYRIGHT ./ || exit 1
perl bundle/$resty_cli/bin/md2pod.pl $root/doc/README-windows.md | pod2text > README-windows.txt || exit 1 perl bundle/$resty_cli/bin/md2pod.pl $root/doc/README-windows.md | pod2text > README-windows.txt || exit 1
unix2dos README-windows.txt || exit 1 unix2dos README-windows.txt || exit 1
mkdir patches/ || exit 1 mkdir patches/ || exit 1
cp $root/patches/openssl-1.1.0j-parallel_build_fix.patch patches/ || exit 1
cp $root/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch patches/ || exit 1 cp $root/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch patches/ || exit 1
cp $root/patches/openssl-1.1.0c-sess_set_get_cb_yield.patch patches/ || exit 1 cp $root/patches/openssl-1.1.0c-sess_set_get_cb_yield.patch patches/ || exit 1
cp $root/patches/openssl-1.1.0d-sess_set_get_cb_yield.patch patches/ || exit 1 cp $root/patches/openssl-1.1.0d-sess_set_get_cb_yield.patch patches/ || exit 1