From ed328977028c3ec3033bc25873ee360056e247cd Mon Sep 17 00:00:00 2001 From: "Yichun Zhang (agentzh)" Date: Sat, 2 Mar 2019 01:17:57 -0800 Subject: [PATCH] bugfix: added an openssl patch to fix the parallel build regression in openssl 1.1.0j. --- .../openssl-1.1.0j-parallel_build_fix.patch | 21 +++++++++++++++++++ util/build-win32.sh | 1 + util/mirror-tarballs | 1 + 3 files changed, 23 insertions(+) create mode 100644 patches/openssl-1.1.0j-parallel_build_fix.patch diff --git a/patches/openssl-1.1.0j-parallel_build_fix.patch b/patches/openssl-1.1.0j-parallel_build_fix.patch new file mode 100644 index 0000000..995bc05 --- /dev/null +++ b/patches/openssl-1.1.0j-parallel_build_fix.patch @@ -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; + } + ''; + -} diff --git a/util/build-win32.sh b/util/build-win32.sh index d8ca3f3..bccf13e 100644 --- a/util/build-win32.sh +++ b/util/build-win32.sh @@ -19,6 +19,7 @@ tar -xf ../../../$PCRE.tar.gz || exit 1 cd ../.. 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 \ || exit 1 cd ../../.. diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 11669cb..c5aaccb 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -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 unix2dos README-windows.txt || 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.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