0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch 2.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134
  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
  5. This patch replaces the default sys_nerr runtest with a test done at
  6. buildtime.
  7. The idea behind this buildtime test is finding the value of the ERR_MAX
  8. macro if defined, or the EHWPOISON (which is currently the last errno)
  9. otherwise.
  10. Signed-off-by: Samuel Martin <s.martin49@gmail.com>
  11. ---
  12. auto/os/sys_nerr | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  13. auto/unix | 10 ++++++++
  14. 2 files changed, 87 insertions(+)
  15. create mode 100644 auto/os/sys_nerr
  16. diff --git a/auto/os/sys_nerr b/auto/os/sys_nerr
  17. new file mode 100644
  18. index 0000000..25e7c22
  19. --- /dev/null
  20. +++ b/auto/os/sys_nerr
  21. @@ -0,0 +1,78 @@
  22. +
  23. +# Copyright (C) Samuel Martin <s.martin49@gmail.com>
  24. +
  25. +
  26. +echo $ngx_n "checking for sys_nerr value...$ngx_c"
  27. +
  28. +# sys_nerr guessing is done using a (very) poor (but working)
  29. +# heuristics, by checking for the value of ERR_MAX if defined, or
  30. +# EHWPOISON otherwise.
  31. +
  32. +cat << END >> $NGX_AUTOCONF_ERR
  33. +
  34. +----------------------------------------
  35. +checking for sys_nerr value
  36. +
  37. +END
  38. +
  39. +ngx_sys_nerr=
  40. +
  41. +cat << _EOF > $NGX_AUTOTEST.c
  42. +
  43. +#include <stdio.h>
  44. +#include <errno.h>
  45. +
  46. +static char sys_nerr_test[ERR_MAX];
  47. +int main(void)
  48. +{
  49. + return 0;
  50. +}
  51. +
  52. +_EOF
  53. +
  54. +if $CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
  55. + $NGX_AUTOTEST.c -o $NGX_AUTOTEST \
  56. + $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 ; then
  57. + _ngx_max_err_macro=ERR_MAX
  58. +else
  59. + # the +2 has been empirically found!
  60. + _ngx_max_err_macro="EHWPOISON + 2"
  61. +fi
  62. +
  63. +cat << _EOF > $NGX_AUTOTEST.c
  64. +
  65. +#include <stdio.h>
  66. +#include <errno.h>
  67. +
  68. +static char sys_nerr_test[(TEST_ERR_MAX == $_ngx_max_err_macro) ? 1 : -1];
  69. +int main(void)
  70. +{
  71. + return 0;
  72. +}
  73. +
  74. +_EOF
  75. +
  76. +
  77. +ngx_sys_nerr=`for i in $(seq 0 2000) ; do \
  78. + $CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
  79. + -DTEST_ERR_MAX="$i" \
  80. + $NGX_AUTOTEST.c -o $NGX_AUTOTEST \
  81. + $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 || continue ;\
  82. + echo $i ; break ; done`
  83. +
  84. +rm -rf $NGX_AUTOTEST*
  85. +
  86. +if test -z $ngx_sys_nerr ; then
  87. + ngx_size=0
  88. + ngx_sys_nerr=0
  89. +fi
  90. +
  91. +cat << END >> $NGX_AUTO_CONFIG_H
  92. +
  93. +#ifndef $ngx_feature_name
  94. +#define $ngx_feature_name $ngx_sys_nerr
  95. +#endif
  96. +
  97. +END
  98. +
  99. +echo " $ngx_sys_nerr"
  100. diff --git a/auto/unix b/auto/unix
  101. index b7cc9cb..1a49ba3 100755
  102. --- a/auto/unix
  103. +++ b/auto/unix
  104. @@ -550,6 +550,10 @@ ngx_feature_incs='#include <errno.h>
  105. #include <stdio.h>'
  106. ngx_feature_path=
  107. ngx_feature_libs=
  108. +
  109. +if false ; then
  110. +# Disabled because only valid for native build.
  111. +
  112. ngx_feature_test='printf("%d", sys_nerr);'
  113. . auto/feature
  114. @@ -598,6 +602,12 @@ if [ $ngx_found = no ]; then
  115. . auto/feature
  116. fi
  117. +else
  118. + # Cross-compilation support
  119. + . auto/os/sys_nerr
  120. +
  121. +fi
  122. +
  123. ngx_feature="localtime_r()"
  124. ngx_feature_name="NGX_HAVE_LOCALTIME_R"
  125. --
  126. 1.9.2