[buildroot-gz.git] / package / nginx / 0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
| blob | ed67a6794460086f91e4da241d6ff621069cf172 |
1 From 71939b727a8fa9f722934700948a5b68960f6183 Mon Sep 17 00:00:00 2001
2 From: Samuel Martin <s.martin49@gmail.com>
3 Date: Thu, 29 May 2014 18:52:10 +0200
4 Subject: [PATCH] auto/*: set ngx_feature_run_force_result for each feature
5 requiring run test
7 Each feature requiring a run test has a matching preset variable (called
8 ngx_force_*) used to set ngx_feature_run_force_result.
10 These ngx_force_* variables are passed through the environment at configure
11 time.
13 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
15 Refresh for 1.8.0.
17 Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
18 ---
19 auto/cc/conf | 3 +++
20 auto/cc/name | 1 +
21 auto/lib/libatomic/conf | 1 +
22 auto/os/darwin | 3 +++
23 auto/os/linux | 4 ++++
24 auto/unix | 8 ++++++++
25 6 files changed, 20 insertions(+)
27 diff --git a/auto/cc/conf b/auto/cc/conf
28 index edc6d74..a61ade4 100644
29 --- a/auto/cc/conf
30 +++ b/auto/cc/conf
31 @@ -159,6 +159,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
32 ngx_feature="gcc builtin atomic operations"
33 ngx_feature_name=NGX_HAVE_GCC_ATOMIC
34 ngx_feature_run=yes
35 + ngx_feature_run_force_result="$ngx_force_gcc_have_atomic"
36 ngx_feature_incs=
37 ngx_feature_path=
38 ngx_feature_libs=
39 @@ -179,6 +180,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
40 ngx_feature="C99 variadic macros"
41 ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
42 ngx_feature_run=yes
43 + ngx_feature_run_force_result="$ngx_force_c99_have_variadic_macros"
44 ngx_feature_incs="#include <stdio.h>
45 #define var(dummy, ...) sprintf(__VA_ARGS__)"
46 ngx_feature_path=
47 @@ -193,6 +195,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
48 ngx_feature="gcc variadic macros"
49 ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
50 ngx_feature_run=yes
51 + ngx_feature_run_force_result="$ngx_force_gcc_have_variadic_macros"
52 ngx_feature_incs="#include <stdio.h>
53 #define var(dummy, args...) sprintf(args)"
54 ngx_feature_path=
55 diff --git a/auto/cc/name b/auto/cc/name
56 index 51a7ed9..d237d47 100644
57 --- a/auto/cc/name
58 +++ b/auto/cc/name
59 @@ -8,6 +8,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
60 ngx_feature="C compiler"
61 ngx_feature_name=
62 ngx_feature_run=yes
63 + ngx_feature_run_force_result="$ngx_force_c_compiler"
64 ngx_feature_incs=
65 ngx_feature_path=
66 ngx_feature_libs=
67 diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
68 index d1e484a..3724916 100644
69 --- a/auto/lib/libatomic/conf
70 +++ b/auto/lib/libatomic/conf
71 @@ -15,6 +15,7 @@ else
72 ngx_feature="atomic_ops library"
73 ngx_feature_name=NGX_HAVE_LIBATOMIC
74 ngx_feature_run=yes
75 + ngx_feature_run_force_result="$ngx_force_have_libatomic"
76 ngx_feature_incs="#define AO_REQUIRE_CAS
77 #include <atomic_ops.h>"
78 ngx_feature_path=
79 diff --git a/auto/os/darwin b/auto/os/darwin
80 index 1d3e3d3..11b7276 100644
81 --- a/auto/os/darwin
82 +++ b/auto/os/darwin
83 @@ -27,6 +27,7 @@ NGX_KQUEUE_CHECKED=YES
84 ngx_feature="kqueue's EVFILT_TIMER"
85 ngx_feature_name="NGX_HAVE_TIMER_EVENT"
86 ngx_feature_run=yes
87 +ngx_feature_run_force_result="$ngx_force_have_timer_event"
88 ngx_feature_incs="#include <sys/event.h>
89 #include <sys/time.h>"
90 ngx_feature_path=
91 @@ -57,6 +58,7 @@ ngx_feature_test="int kq;
92 ngx_feature="Darwin 64-bit kqueue millisecond timeout bug"
93 ngx_feature_name=NGX_DARWIN_KEVENT_BUG
94 ngx_feature_run=bug
95 +ngx_feature_run_force_result="$ngx_force_kevent_bug"
96 ngx_feature_incs="#include <sys/event.h>
97 #include <sys/time.h>"
98 ngx_feature_path=
99 @@ -87,6 +89,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS"
100 ngx_feature="sendfile()"
101 ngx_feature_name="NGX_HAVE_SENDFILE"
102 ngx_feature_run=yes
103 +ngx_feature_run_force_result="$ngx_force_have_sendfile"
104 ngx_feature_incs="#include <sys/types.h>
105 #include <sys/socket.h>
106 #include <sys/uio.h>
107 diff --git a/auto/os/linux b/auto/os/linux
108 index 19bf832..16848b2 100644
109 --- a/auto/os/linux
110 +++ b/auto/os/linux
111 @@ -49,6 +49,7 @@ fi
112 ngx_feature="epoll"
113 ngx_feature_name="NGX_HAVE_EPOLL"
114 ngx_feature_run=yes
115 +ngx_feature_run_force_result="$ngx_force_have_epoll"
116 ngx_feature_incs="#include <sys/epoll.h>"
117 ngx_feature_path=
118 ngx_feature_libs=
119 @@ -106,6 +107,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
120 ngx_feature="sendfile()"
121 ngx_feature_name="NGX_HAVE_SENDFILE"
122 ngx_feature_run=yes
123 +ngx_feature_run_force_result="$ngx_force_have_sendfile"
124 ngx_feature_incs="#include <sys/sendfile.h>
125 #include <errno.h>"
126 ngx_feature_path=
127 @@ -127,6 +129,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
128 ngx_feature="sendfile64()"
129 ngx_feature_name="NGX_HAVE_SENDFILE64"
130 ngx_feature_run=yes
131 +ngx_feature_run_force_result="$ngx_force_have_sendfile64"
132 ngx_feature_incs="#include <sys/sendfile.h>
133 #include <errno.h>"
134 ngx_feature_path=
135 @@ -145,6 +148,7 @@ ngx_include="sys/prctl.h"; . auto/include
136 ngx_feature="prctl(PR_SET_DUMPABLE)"
137 ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
138 ngx_feature_run=yes
139 +ngx_feature_run_force_result="$ngx_force_have_pr_set_dumpable"
140 ngx_feature_incs="#include <sys/prctl.h>"
141 ngx_feature_path=
142 ngx_feature_libs=
143 diff --git a/auto/unix b/auto/unix
144 index 6e54531..7dbf9d1 100755
145 --- a/auto/unix
146 +++ b/auto/unix
147 @@ -99,6 +99,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
148 ngx_feature="kqueue's EVFILT_TIMER"
149 ngx_feature_name="NGX_HAVE_TIMER_EVENT"
150 ngx_feature_run=yes
151 + ngx_feature_run_force_result="$ngx_force_have_timer_event"
152 ngx_feature_incs="#include <sys/event.h>
153 #include <sys/time.h>"
154 ngx_feature_path=
155 @@ -589,6 +590,7 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0);
156 ngx_feature="sys_nerr"
157 ngx_feature_name="NGX_SYS_NERR"
158 ngx_feature_run=value
159 +ngx_feature_run_force_result="$ngx_force_sys_nerr"
160 ngx_feature_incs='#include <errno.h>
161 #include <stdio.h>'
162 ngx_feature_path=
163 @@ -603,6 +605,7 @@ if [ $ngx_found = no ]; then
164 ngx_feature="_sys_nerr"
165 ngx_feature_name="NGX_SYS_NERR"
166 ngx_feature_run=value
167 + ngx_feature_run_force_result="$ngx_force_sys_nerr"
168 ngx_feature_incs='#include <errno.h>
169 #include <stdio.h>'
170 ngx_feature_path=
171 @@ -618,6 +621,7 @@ if [ $ngx_found = no ]; then
172 ngx_feature='maximum errno'
173 ngx_feature_name=NGX_SYS_NERR
174 ngx_feature_run=value
175 + ngx_feature_run_force_result="$ngx_force_sys_nerr"
176 ngx_feature_incs='#include <errno.h>
177 #include <string.h>
178 #include <stdio.h>'
179 @@ -676,6 +680,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096);
180 ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
181 ngx_feature_name="NGX_HAVE_MAP_ANON"
182 ngx_feature_run=yes
183 +ngx_feature_run_force_result="$ngx_force_have_map_anon"
184 ngx_feature_incs="#include <sys/mman.h>"
185 ngx_feature_path=
186 ngx_feature_libs=
187 @@ -689,6 +694,7 @@ ngx_feature_test="void *p;
188 ngx_feature='mmap("/dev/zero", MAP_SHARED)'
189 ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
190 ngx_feature_run=yes
191 +ngx_feature_run_force_result="$ngx_force_have_map_devzero"
192 ngx_feature_incs="#include <sys/mman.h>
193 #include <sys/stat.h>
194 #include <fcntl.h>"
195 @@ -704,6 +710,7 @@ ngx_feature_test='void *p; int fd;
196 ngx_feature="System V shared memory"
197 ngx_feature_name="NGX_HAVE_SYSVSHM"
198 ngx_feature_run=yes
199 +ngx_feature_run_force_result="$ngx_force_have_sysvshm"
200 ngx_feature_incs="#include <sys/ipc.h>
201 #include <sys/shm.h>"
202 ngx_feature_path=
203 @@ -718,6 +725,7 @@ ngx_feature_test="int id;
204 ngx_feature="POSIX semaphores"
205 ngx_feature_name="NGX_HAVE_POSIX_SEM"
206 ngx_feature_run=yes
207 +ngx_feature_run_force_result="$ngx_force_have_posix_sem"
208 ngx_feature_incs="#include <semaphore.h>"
209 ngx_feature_path=
210 ngx_feature_libs=
211 --
212 1.9.1