summaryrefslogtreecommitdiff
path: root/package/nginx/patches/patch-auto_cc_conf
diff options
context:
space:
mode:
Diffstat (limited to 'package/nginx/patches/patch-auto_cc_conf')
-rw-r--r--package/nginx/patches/patch-auto_cc_conf16
1 files changed, 12 insertions, 4 deletions
diff --git a/package/nginx/patches/patch-auto_cc_conf b/package/nginx/patches/patch-auto_cc_conf
index e92ace494..99550ab48 100644
--- a/package/nginx/patches/patch-auto_cc_conf
+++ b/package/nginx/patches/patch-auto_cc_conf
@@ -1,6 +1,14 @@
---- nginx-1.7.9.orig/auto/cc/conf 2014-12-23 09:28:38.000000000 -0600
-+++ nginx-1.7.9/auto/cc/conf 2014-12-25 00:19:14.557499365 -0600
-@@ -178,7 +178,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+--- nginx-1.9.12.orig/auto/cc/conf 2016-02-24 15:53:23.000000000 +0100
++++ nginx-1.9.12/auto/cc/conf 2016-03-04 19:56:52.000000000 +0100
+@@ -181,6 +181,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+ ngx_feature="gcc builtin atomic operations"
+ ngx_feature_name=NGX_HAVE_GCC_ATOMIC
+ ngx_feature_run=yes
++ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic"
+ ngx_feature_incs=
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -200,7 +201,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
else
ngx_feature="C99 variadic macros"
ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
@@ -9,7 +17,7 @@
ngx_feature_incs="#include <stdio.h>
#define var(dummy, ...) sprintf(__VA_ARGS__)"
ngx_feature_path=
-@@ -192,7 +192,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -214,7 +215,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
ngx_feature="gcc variadic macros"
ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"