1 From 8c19cea5e667f325ececdc1678bfddf063af0da2 Mon Sep 17 00:00:00 2001
2 From: Samuel Martin <s.martin49@gmail.com>
3 Date: Sun, 1 Jun 2014 16:05:04 +0200
4 Subject: [PATCH 5/5] auto/unix: make sys_nerr guessing cross-friendly
6 This patch replaces the default sys_nerr runtest with a test done at
9 The idea behind this buildtime test is finding the value of the ERR_MAX
10 macro if defined, or the EHWPOISON (which is currently the last errno)
13 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
15 auto/os/sys_nerr | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
16 auto/unix | 10 ++++++++
17 2 files changed, 87 insertions(+)
18 create mode 100644 auto/os/sys_nerr
20 diff --git a/auto/os/sys_nerr b/auto/os/sys_nerr
22 index 0000000..25e7c22
24 +++ b/auto/os/sys_nerr
27 +# Copyright (C) Samuel Martin <s.martin49@gmail.com>
30 +echo $ngx_n "checking for sys_nerr value...$ngx_c"
32 +# sys_nerr guessing is done using a (very) poor (but working)
33 +# heuristics, by checking for the value of ERR_MAX if defined, or
34 +# EHWPOISON otherwise.
36 +cat << END >> $NGX_AUTOCONF_ERR
38 +----------------------------------------
39 +checking for sys_nerr value
45 +cat << _EOF > $NGX_AUTOTEST.c
50 +static char sys_nerr_test[ERR_MAX];
58 +if $CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
59 + $NGX_AUTOTEST.c -o $NGX_AUTOTEST \
60 + $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 ; then
61 + _ngx_max_err_macro=ERR_MAX
63 + # the +2 has been empirically found!
64 + _ngx_max_err_macro="EHWPOISON + 2"
67 +cat << _EOF > $NGX_AUTOTEST.c
72 +static char sys_nerr_test[(TEST_ERR_MAX == $_ngx_max_err_macro) ? 1 : -1];
81 +ngx_sys_nerr=`for i in $(seq 0 2000) ; do \
82 + $CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
83 + -DTEST_ERR_MAX="$i" \
84 + $NGX_AUTOTEST.c -o $NGX_AUTOTEST \
85 + $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 || continue ;\
86 + echo $i ; break ; done`
88 +rm -rf $NGX_AUTOTEST*
90 +if test -z $ngx_sys_nerr ; then
95 +cat << END >> $NGX_AUTO_CONFIG_H
97 +#ifndef $ngx_feature_name
98 +#define $ngx_feature_name $ngx_sys_nerr
103 +echo " $ngx_sys_nerr"
104 diff --git a/auto/unix b/auto/unix
105 index b7cc9cb..1a49ba3 100755
108 @@ -550,6 +550,10 @@ ngx_feature_incs='#include <errno.h>
114 +# Disabled because only valid for native build.
116 ngx_feature_test='printf("%d", sys_nerr);'
119 @@ -598,6 +602,12 @@ if [ $ngx_found = no ]; then
124 + # Cross-compilation support
130 ngx_feature="localtime_r()"
131 ngx_feature_name="NGX_HAVE_LOCALTIME_R"