cirros-testvm/src-cirros/buildroot-2015.05/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch

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