Mercurial > hg > nginx

annotate auto/lib/openssl/make @ 9279:2fce021888f9 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed incorrect NGX_SUPPRESS_WARN usage. The len variable in ngx_http_variable_unknown_header() needs to be initialized to 0, as it is incremented by subsequent code.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 31 May 2024 04:38:40 +0300
parents 3c4d81ea1338
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
1
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
2 # Copyright (C) Igor Sysoev
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 3492
diff changeset
3 # Copyright (C) Nginx, Inc.
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
4
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
5
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
6 case "$CC" in
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
7
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
8 cl)
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
9
8129
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
10 case "$NGX_MACHINE" in
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
11
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
12 amd64)
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
13 OPENSSL_TARGET=VC-WIN64A
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
14 ;;
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
15
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
16 *)
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
17 OPENSSL_TARGET=VC-WIN32
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
18 ;;
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
19
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
20 esac
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
21
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
22 cat << END >> $NGX_MAKEFILE
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
23
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
24 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
25 \$(MAKE) -f auto/lib/openssl/makefile.msvc \
8129
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
26 OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT" \
3c4d81ea1338 Win32: OpenSSL compilation for x64 targets with MSVC.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7247
diff changeset
27 OPENSSL_TARGET="$OPENSSL_TARGET"
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
28
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
29 END
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
30
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
31 ;;
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
32
2897
d5d3fe7197cc *) use no-threads for Unix builds only
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
33 bcc32)
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
34
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
35 ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
36 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
37
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
38 cat << END >> $NGX_MAKEFILE
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
39
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
40 `echo "$OPENSSL\\openssl\\lib\\libeay32.lib: \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
41 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
42 | sed -e "s/\//$ngx_regex_dirsep/g"`
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
43
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
44 `echo "$OPENSSL\\openssl\\lib\\ssleay32.lib: \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
45 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
46 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
47
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
48 `echo "$OPENSSL\\openssl\\include\\openssl\\ssl.h: $NGX_MAKEFILE" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
49 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
50 \$(MAKE) -f auto/lib/openssl/makefile.bcc $ngx_opt
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
51
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
52 END
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
53
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
54 ;;
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
55
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
56 *)
2897
d5d3fe7197cc *) use no-threads for Unix builds only
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
57 case $OPENSSL in
3168
83c940b0d18a allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents: 2897
diff changeset
58 /*) ngx_prefix="$OPENSSL/.openssl" ;;
83c940b0d18a allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents: 2897
diff changeset
59 *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
2879
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
60 esac
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
61
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
62 cat << END >> $NGX_MAKEFILE
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
63
3168
83c940b0d18a allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents: 2897
diff changeset
64 $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
65 cd $OPENSSL \\
5438
f817f9d1cded Configure: call "make clean" for OpenSSL only if Makefile exists.
Piotr Sikora <piotr@cloudflare.com>
parents: 4412
diff changeset
66 && if [ -f Makefile ]; then \$(MAKE) clean; fi \\
7247
b329c0ab1a48 Configure: restored "no-threads" in OpenSSL builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6404
diff changeset
67 && ./config --prefix=$ngx_prefix no-shared no-threads $OPENSSL_OPT \\
2873
e069d0b8b198 fix building OpenSSL on Unix
Igor Sysoev <igor@sysoev.ru>
parents: 2846
diff changeset
68 && \$(MAKE) \\
6404
09d5a22c76bd Configure: skip building OpenSSL documentation to conserve time.
Sergey Kandaurov <pluknet@nginx.com>
parents: 6017
diff changeset
69 && \$(MAKE) install_sw LIBDIR=lib
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
70
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
71 END
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
72
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
73 ;;
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
74
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
75 esac