[ptxdist] [PATCH] nginx: fix IPv6 build override patch

[ptxdist] [PATCH] nginx: fix IPv6 build override patch

[Clemens Gruber]

In the previous version of the IPv6 override patch, the defines were
defined to yes but nginx checked them with #if, which did not work.
Fix it by defining to 1 or 0 but keeping yes/no in the rule file for
consistency with the other environment variables.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...unix-allow-overriding-the-IPv6-build-test.patch | 30 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch b/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
index 93813beb7..2fdf43a4c 100644
--- a/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
+++ b/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
@@ -4,11 +4,33 @@ Subject: [PATCH] auto/unix: allow overriding the IPv6 build tests
 
 Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
 ---
- auto/unix | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
+ 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 ed821b5a5aaa..dba1be478b9d 100644
+index ed821b5a5aaa..e7ad3b5c0be5 100644
 --- a/auto/unix
 +++ b/auto/unix
 @@ -412,7 +412,8 @@ ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)"
@@ -21,7 +43,7 @@ index ed821b5a5aaa..dba1be478b9d 100644
  ngx_feature_incs="#include <sys/socket.h>
                    #include <netinet/in.h>"
  ngx_feature_path=
-@@ -640,7 +640,8 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
+@@ -640,7 +641,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"
-- 
2.15.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de