diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch')
| -rw-r--r-- | meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch index 5f899a1d84..46792ba067 100644 --- a/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch @@ -122,7 +122,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof --- nginx-1.0.11.orig/auto/types/sizeof 2006-06-28 11:00:26.000000000 -0500 +++ nginx-1.0.11/auto/types/sizeof 2011-12-27 13:56:42.323370040 -0600 -@@ -11,9 +11,12 @@ +@@ -12,9 +12,12 @@ END @@ -137,14 +137,14 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof #include <sys/types.h> #include <sys/time.h> -@@ -31,19 +34,20 @@ +@@ -33,20 +36,20 @@ END -ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ - -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" + ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" ++ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" -eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" + eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" @@ -155,17 +155,18 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof - echo " $ngx_size bytes" -fi + if [ -x $NGX_AUTOTEST ]; then -+ ngx_size=`$NGX_AUTOTEST` -+ echo " $ngx_size bytes" ++ ngx_size=`$NGX_AUTOTEST` ++ echo " $ngx_size bytes" + fi --rm -f $NGX_AUTOTEST -+ rm -f $NGX_AUTOTEST +-rm -rf $NGX_AUTOTEST* +- ++ rm -rf $NGX_AUTOTEST* +fi - case $ngx_size in + 4) diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix --- nginx-1.0.11.orig/auto/unix 2011-12-14 07:34:16.000000000 -0600 +++ nginx-1.0.11/auto/unix 2011-12-27 13:56:42.327370060 -0600 |