Mercurial > hg > nginx-vendor-current

annotate auto/lib/openssl/make @ 660:d0f7a625f27c NGINX_1_1_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.14 *) Feature: multiple "limit_req" limits may be used simultaneously. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "proxy_redirect" directives might not be correctly inherited. *) Bugfix: memory leak during reconfiguration if the "pcre_jit" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Jan 2012 00:00:00 +0400
parents 566e105a89f1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
660
d0f7a625f27c nginx 1.1.14
Igor Sysoev <http://sysoev.ru>
parents: 568
diff changeset
3 # Copyright (C) Nginx, Inc.
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
5
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
6 case "$CC" in
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
7
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
8 cl)
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
9
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
10 cat << END >> $NGX_MAKEFILE
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
11
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
12 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
13 \$(MAKE) -f auto/lib/openssl/makefile.msvc \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
14 OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
15
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
16 END
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
17
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
18 ;;
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
19
496
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
20 bcc32)
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
21
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
22 ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
23 | sed -e "s/\//$ngx_regex_dirsep/g"`
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
24
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
25 cat << END >> $NGX_MAKEFILE
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
26
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
27 `echo "$OPENSSL\\openssl\\lib\\libeay32.lib: \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
28 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
29 | sed -e "s/\//$ngx_regex_dirsep/g"`
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
30
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
31 `echo "$OPENSSL\\openssl\\lib\\ssleay32.lib: \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
32 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
33 | sed -e "s/\//$ngx_regex_dirsep/g"`
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
34
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
35 `echo "$OPENSSL\\openssl\\include\\openssl\\ssl.h: $NGX_MAKEFILE" \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
36 | sed -e "s/\//$ngx_regex_dirsep/g"`
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
37 \$(MAKE) -f auto/lib/openssl/makefile.bcc $ngx_opt
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
38
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
39 END
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
40
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
41 ;;
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
42
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 *)
496
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
44 case $USE_THREADS in
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
45 NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
46 *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
47 esac
494
499474178a11 nginx 0.7.59
Igor Sysoev <http://sysoev.ru>
parents: 492
diff changeset
48
496
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
49 case $OPENSSL in
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
50 /*) ngx_prefix="$OPENSSL/.openssl" ;;
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
51 *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
494
499474178a11 nginx 0.7.59
Igor Sysoev <http://sysoev.ru>
parents: 492
diff changeset
52 esac
499474178a11 nginx 0.7.59
Igor Sysoev <http://sysoev.ru>
parents: 492
diff changeset
53
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
54 cat << END >> $NGX_MAKEFILE
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
55
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
56 $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
57 cd $OPENSSL \\
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
58 && \$(MAKE) clean \\
494
499474178a11 nginx 0.7.59
Igor Sysoev <http://sysoev.ru>
parents: 492
diff changeset
59 && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
499474178a11 nginx 0.7.59
Igor Sysoev <http://sysoev.ru>
parents: 492
diff changeset
60 && \$(MAKE) \\
568
566e105a89f1 nginx 0.8.36
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
61 && \$(MAKE) install LIBDIR=lib
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
62
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
63 END
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
64
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67 esac