Mercurial > hg > nginx-quic

comparison auto/lib/openssl/make @ 7247:b329c0ab1a48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure: restored "no-threads" in OpenSSL builds. This was previously used, but was incorrectly removed in 83d54192e97b while removing old threads remnants. Instead of using it conditionally when threads are not used, we now set in unconditionally, as even with thread pools enabled we never call OpenSSL functions in threads. This fixes resulting binary when using --with-openssl with OpenSSL 1.1.0+ and without -lpthread linked (notably on FreeBSD without PCRE).
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 22 Mar 2018 15:56:07 +0300
parents 09d5a22c76bd
children 3c4d81ea1338
comparison
equal deleted inserted replaced
7246:04ebf29eaf5b 7247:b329c0ab1a48
49 cat << END >> $NGX_MAKEFILE 49 cat << END >> $NGX_MAKEFILE
50 50
51 $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE 51 $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
52 cd $OPENSSL \\ 52 cd $OPENSSL \\
53 && if [ -f Makefile ]; then \$(MAKE) clean; fi \\ 53 && if [ -f Makefile ]; then \$(MAKE) clean; fi \\
54 && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\ 54 && ./config --prefix=$ngx_prefix no-shared no-threads $OPENSSL_OPT \\
55 && \$(MAKE) \\ 55 && \$(MAKE) \\
56 && \$(MAKE) install_sw LIBDIR=lib 56 && \$(MAKE) install_sw LIBDIR=lib
57 57
58 END 58 END
59 59