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