diff options
Diffstat (limited to 'patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch')
| -rw-r--r-- | patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch b/patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch new file mode 100644 index 000000000..d8c4a04b1 --- /dev/null +++ b/patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch @@ -0,0 +1,55 @@ +From: Clemens Gruber <clemens.gruber@pqgruber.com> +Date: Thu, 3 Aug 2017 15:47:08 +0200 +Subject: [PATCH] auto/unix: allow overriding the IPv6 build tests + +Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com> +--- + auto/feature | 7 ++++++- + auto/unix | 6 ++++-- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/auto/feature b/auto/feature +index 8016d802e7a8..a9c6b6ee5eeb 100644 +--- a/auto/feature ++++ b/auto/feature +@@ -81,10 +81,15 @@ if [ -x $NGX_AUTOTEST ]; then + value) + if test -n "$ngx_feature_run_force_result" ; then + echo " not tested (maybe cross-compiling)" ++ if test "$ngx_feature_run_force_result" = "yes" ; then ++ ngx_feature_run_force_result_int=1 ++ else ++ ngx_feature_run_force_result_int=0 ++ fi + cat << END >> $NGX_AUTO_CONFIG_H + + #ifndef $ngx_feature_name +-#define $ngx_feature_name $ngx_feature_run_force_result ++#define $ngx_feature_name $ngx_feature_run_force_result_int + #endif + + END +diff --git a/auto/unix b/auto/unix +index a67ee3e2939c..1c3c1cf5996f 100644 +--- a/auto/unix ++++ b/auto/unix +@@ -440,7 +440,8 @@ ngx_feature_test="struct in_pktinfo pkt; + + ngx_feature="IPV6_RECVPKTINFO" + ngx_feature_name="NGX_HAVE_IPV6_RECVPKTINFO" +-ngx_feature_run=no ++ngx_feature_run_force_result="$ngx_force_ipv6" ++ngx_feature_run=value + ngx_feature_incs="#include <sys/socket.h> + #include <netinet/in.h>" + ngx_feature_path= +@@ -668,7 +669,8 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value + + ngx_feature="AF_INET6" + ngx_feature_name="NGX_HAVE_INET6" +-ngx_feature_run=no ++ngx_feature_run_force_result="$ngx_force_ipv6" ++ngx_feature_run=value + ngx_feature_incs="#include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h>" |