0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch 7.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213
  1. From 57d9d632be9a9f7e3ac00f9eb10b069afd0b1543 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
  6. Each feature requiring a run test has a matching preset variable (called
  7. ngx_force_*) used to set ngx_feature_run_force_result.
  8. These ngx_force_* variables are passed through the environment at configure
  9. time.
  10. Signed-off-by: Samuel Martin <s.martin49@gmail.com>
  11. Refresh for 1.8.0.
  12. Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
  13. ---
  14. auto/cc/conf | 3 +++
  15. auto/cc/name | 1 +
  16. auto/lib/libatomic/conf | 1 +
  17. auto/os/darwin | 3 +++
  18. auto/os/linux | 4 ++++
  19. auto/unix | 8 ++++++++
  20. 6 files changed, 20 insertions(+)
  21. diff --git a/auto/cc/conf b/auto/cc/conf
  22. index afbca62b..ad42c800 100644
  23. --- a/auto/cc/conf
  24. +++ b/auto/cc/conf
  25. @@ -184,6 +184,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
  26. ngx_feature="gcc builtin atomic operations"
  27. ngx_feature_name=NGX_HAVE_GCC_ATOMIC
  28. ngx_feature_run=yes
  29. + ngx_feature_run_force_result="$ngx_force_gcc_have_atomic"
  30. ngx_feature_incs=
  31. ngx_feature_path=
  32. ngx_feature_libs=
  33. @@ -205,6 +206,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
  34. ngx_feature="C99 variadic macros"
  35. ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
  36. ngx_feature_run=yes
  37. + ngx_feature_run_force_result="$ngx_force_c99_have_variadic_macros"
  38. ngx_feature_incs="#include <stdio.h>
  39. #define var(dummy, ...) sprintf(__VA_ARGS__)"
  40. ngx_feature_path=
  41. @@ -219,6 +221,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
  42. ngx_feature="gcc variadic macros"
  43. ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
  44. ngx_feature_run=yes
  45. + ngx_feature_run_force_result="$ngx_force_gcc_have_variadic_macros"
  46. ngx_feature_incs="#include <stdio.h>
  47. #define var(dummy, args...) sprintf(args)"
  48. ngx_feature_path=
  49. diff --git a/auto/cc/name b/auto/cc/name
  50. index ded93f5b..7c3cb74a 100644
  51. --- a/auto/cc/name
  52. +++ b/auto/cc/name
  53. @@ -8,6 +8,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
  54. ngx_feature="C compiler"
  55. ngx_feature_name=
  56. ngx_feature_run=yes
  57. + ngx_feature_run_force_result="$ngx_force_c_compiler"
  58. ngx_feature_incs=
  59. ngx_feature_path=
  60. ngx_feature_libs=
  61. diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
  62. index d1e484ab..37249161 100644
  63. --- a/auto/lib/libatomic/conf
  64. +++ b/auto/lib/libatomic/conf
  65. @@ -15,6 +15,7 @@ else
  66. ngx_feature="atomic_ops library"
  67. ngx_feature_name=NGX_HAVE_LIBATOMIC
  68. ngx_feature_run=yes
  69. + ngx_feature_run_force_result="$ngx_force_have_libatomic"
  70. ngx_feature_incs="#define AO_REQUIRE_CAS
  71. #include <atomic_ops.h>"
  72. ngx_feature_path=
  73. diff --git a/auto/os/darwin b/auto/os/darwin
  74. index 429468f7..1ed47cca 100644
  75. --- a/auto/os/darwin
  76. +++ b/auto/os/darwin
  77. @@ -33,6 +33,7 @@ NGX_KQUEUE_CHECKED=YES
  78. ngx_feature="kqueue's EVFILT_TIMER"
  79. ngx_feature_name="NGX_HAVE_TIMER_EVENT"
  80. ngx_feature_run=yes
  81. +ngx_feature_run_force_result="$ngx_force_have_timer_event"
  82. ngx_feature_incs="#include <sys/event.h>
  83. #include <sys/time.h>"
  84. ngx_feature_path=
  85. @@ -63,6 +64,7 @@ ngx_feature_test="int kq;
  86. ngx_feature="Darwin 64-bit kqueue millisecond timeout bug"
  87. ngx_feature_name=NGX_DARWIN_KEVENT_BUG
  88. ngx_feature_run=bug
  89. +ngx_feature_run_force_result="$ngx_force_kevent_bug"
  90. ngx_feature_incs="#include <sys/event.h>
  91. #include <sys/time.h>"
  92. ngx_feature_path=
  93. @@ -92,6 +94,7 @@ ngx_feature_test="int kq;
  94. ngx_feature="sendfile()"
  95. ngx_feature_name="NGX_HAVE_SENDFILE"
  96. ngx_feature_run=yes
  97. +ngx_feature_run_force_result="$ngx_force_have_sendfile"
  98. ngx_feature_incs="#include <sys/types.h>
  99. #include <sys/socket.h>
  100. #include <sys/uio.h>
  101. diff --git a/auto/os/linux b/auto/os/linux
  102. index 2c8a9bb8..eb4513ee 100644
  103. --- a/auto/os/linux
  104. +++ b/auto/os/linux
  105. @@ -37,6 +37,7 @@ fi
  106. ngx_feature="epoll"
  107. ngx_feature_name="NGX_HAVE_EPOLL"
  108. ngx_feature_run=yes
  109. +ngx_feature_run_force_result="$ngx_force_have_epoll"
  110. ngx_feature_incs="#include <sys/epoll.h>"
  111. ngx_feature_path=
  112. ngx_feature_libs=
  113. @@ -111,6 +112,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
  114. ngx_feature="sendfile()"
  115. ngx_feature_name="NGX_HAVE_SENDFILE"
  116. ngx_feature_run=yes
  117. +ngx_feature_run_force_result="$ngx_force_have_sendfile"
  118. ngx_feature_incs="#include <sys/sendfile.h>
  119. #include <errno.h>"
  120. ngx_feature_path=
  121. @@ -132,6 +134,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
  122. ngx_feature="sendfile64()"
  123. ngx_feature_name="NGX_HAVE_SENDFILE64"
  124. ngx_feature_run=yes
  125. +ngx_feature_run_force_result="$ngx_force_have_sendfile64"
  126. ngx_feature_incs="#include <sys/sendfile.h>
  127. #include <errno.h>"
  128. ngx_feature_path=
  129. @@ -150,6 +153,7 @@ ngx_include="sys/prctl.h"; . auto/include
  130. ngx_feature="prctl(PR_SET_DUMPABLE)"
  131. ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
  132. ngx_feature_run=yes
  133. +ngx_feature_run_force_result="$ngx_force_have_pr_set_dumpable"
  134. ngx_feature_incs="#include <sys/prctl.h>"
  135. ngx_feature_path=
  136. ngx_feature_libs=
  137. diff --git a/auto/unix b/auto/unix
  138. index 43d3b25a..3da00537 100644
  139. --- a/auto/unix
  140. +++ b/auto/unix
  141. @@ -100,6 +100,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
  142. ngx_feature="kqueue's EVFILT_TIMER"
  143. ngx_feature_name="NGX_HAVE_TIMER_EVENT"
  144. ngx_feature_run=yes
  145. + ngx_feature_run_force_result="$ngx_force_have_timer_event"
  146. ngx_feature_incs="#include <sys/event.h>
  147. #include <sys/time.h>"
  148. ngx_feature_path=
  149. @@ -730,6 +731,7 @@ ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n;
  150. ngx_feature="sys_nerr"
  151. ngx_feature_name="NGX_SYS_NERR"
  152. ngx_feature_run=value
  153. +ngx_feature_run_force_result="$ngx_force_sys_nerr"
  154. ngx_feature_incs='#include <errno.h>
  155. #include <stdio.h>'
  156. ngx_feature_path=
  157. @@ -744,6 +746,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. @@ -759,6 +762,7 @@ if [ $ngx_found = no ]; then
  166. ngx_feature='maximum errno'
  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 <string.h>
  172. #include <stdio.h>'
  173. @@ -841,6 +845,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. @@ -854,6 +859,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. @@ -869,6 +875,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. @@ -883,6 +890,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. --
  206. 2.17.1