summaryrefslogtreecommitdiffstats
path: root/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch
diff options
context:
space:
mode:
Diffstat (limited to 'import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch')
-rw-r--r--import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch215
1 files changed, 0 insertions, 215 deletions
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch
deleted file mode 100644
index 0a18bcd33..000000000
--- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-We do not have capability to run binaries when cross compiling
-
-Upstream-Status: Pending
-
-
-Index: nginx-1.12.2/auto/feature
-===================================================================
---- nginx-1.12.2.orig/auto/feature
-+++ nginx-1.12.2/auto/feature
-@@ -49,12 +49,20 @@ eval "/bin/sh -c \"$ngx_test\" >> $NGX_A
-
- if [ -x $NGX_AUTOTEST ]; then
-
-+ if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then
-+ NGX_AUTOTEST_EXEC="true"
-+ NGX_FOUND_MSG=" (not tested, cross compiling)"
-+ else
-+ NGX_AUTOTEST_EXEC="$NGX_AUTOTEST"
-+ NGX_FOUND_MSG=""
-+ fi
-+
- case "$ngx_feature_run" in
-
- yes)
- # /bin/sh is used to intercept "Killed" or "Abort trap" messages
-- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
-- echo " found"
-+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then
-+ echo " found$NGX_FOUND_MSG"
- ngx_found=yes
-
- if test -n "$ngx_feature_name"; then
-@@ -68,17 +76,27 @@ if [ -x $NGX_AUTOTEST ]; then
-
- value)
- # /bin/sh is used to intercept "Killed" or "Abort trap" messages
-- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
-- echo " found"
-+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then
-+ echo " found$NGX_FOUND_MSG"
- ngx_found=yes
-
-- cat << END >> $NGX_AUTO_CONFIG_H
-+ if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then
-+ cat << END >> $NGX_AUTO_CONFIG_H
-
- #ifndef $ngx_feature_name
--#define $ngx_feature_name `$NGX_AUTOTEST`
-+#define $ngx_feature_name $(eval "echo \$NGX_WITH_${ngx_feature_name}")
- #endif
-
- END
-+ else
-+ cat << END >> $NGX_AUTO_CONFIG_H
-+
-+#ifndef $ngx_feature_name
-+#define $ngx_feature_name `$NGX_AUTOTEST_EXEC`
-+#endif
-+
-+END
-+ fi
- else
- echo " found but is not working"
- fi
-@@ -86,7 +104,7 @@ END
-
- bug)
- # /bin/sh is used to intercept "Killed" or "Abort trap" messages
-- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
-+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then
- echo " not found"
-
- else
-Index: nginx-1.12.2/auto/options
-===================================================================
---- nginx-1.12.2.orig/auto/options
-+++ nginx-1.12.2/auto/options
-@@ -386,6 +386,18 @@ $0: warning: the \"--with-sha1-asm\" opt
- --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;;
- --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
-
-+ # cross compile support
-+ --with-int=*) NGX_WITH_INT="$value" ;;
-+ --with-long=*) NGX_WITH_LONG="$value" ;;
-+ --with-long-long=*) NGX_WITH_LONG_LONG="$value" ;;
-+ --with-ptr-size=*) NGX_WITH_PTR_SIZE="$value" ;;
-+ --with-sig-atomic-t=*) NGX_WITH_SIG_ATOMIC_T="$value" ;;
-+ --with-size-t=*) NGX_WITH_SIZE_T="$value" ;;
-+ --with-off-t=*) NGX_WITH_OFF_T="$value" ;;
-+ --with-time-t=*) NGX_WITH_TIME_T="$value" ;;
-+ --with-sys-nerr=*) NGX_WITH_NGX_SYS_NERR="$value" ;;
-+ --with-endian=*) NGX_WITH_ENDIAN="$value" ;;
-+
- *)
- echo "$0: error: invalid option \"$option\""
- exit 1
-@@ -568,6 +580,17 @@ cat << END
-
- --with-debug enable debug logging
-
-+ --with-int=VALUE force int size
-+ --with-long=VALUE force long size
-+ --with-long-long=VALUE force long long size
-+ --with-ptr-size=VALUE force pointer size
-+ --with-sig-atomic-t=VALUE force sig_atomic_t size
-+ --with-size-t=VALUE force size_t size
-+ --with-off-t=VALUE force off_t size
-+ --with-time-t=VALUE force time_t size
-+ --with-sys-nerr=VALUE force sys_nerr value
-+ --with-endian=VALUE force system endianess
-+
- END
-
- exit 1
-@@ -576,6 +599,8 @@ fi
-
- if [ ".$NGX_PLATFORM" = ".win32" ]; then
- NGX_WINE=$WINE
-+elif [ ! -z "$NGX_PLATFORM" ]; then
-+ NGX_CROSS_COMPILE="yes"
- fi
-
-
-Index: nginx-1.12.2/auto/types/sizeof
-===================================================================
---- nginx-1.12.2.orig/auto/types/sizeof
-+++ nginx-1.12.2/auto/types/sizeof
-@@ -12,9 +12,12 @@ checking for $ngx_type size
-
- END
-
--ngx_size=
-+ngx_size=$(eval "echo \$NGX_WITH_${ngx_param}")
-
--cat << END > $NGX_AUTOTEST.c
-+if [ ".$ngx_size" != "." ]; then
-+ echo " $ngx_size bytes"
-+else
-+ cat << END > $NGX_AUTOTEST.c
-
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -33,15 +36,16 @@ int main(void) {
- 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"
-
--eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
-+ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
-
-
--if [ -x $NGX_AUTOTEST ]; then
-- ngx_size=`$NGX_AUTOTEST`
-- echo " $ngx_size bytes"
-+ if [ -x $NGX_AUTOTEST ]; then
-+ ngx_size=`$NGX_AUTOTEST`
-+ echo " $ngx_size bytes"
-+ fi
- fi
-
-
-Index: nginx-1.12.2/auto/unix
-===================================================================
---- nginx-1.12.2.orig/auto/unix
-+++ nginx-1.12.2/auto/unix
-@@ -587,13 +587,13 @@ ngx_feature_libs=
-
- # C types
-
--ngx_type="int"; . auto/types/sizeof
-+ngx_type="int"; ngx_param="INT"; . auto/types/sizeof
-
--ngx_type="long"; . auto/types/sizeof
-+ngx_type="long"; ngx_param="LONG"; . auto/types/sizeof
-
--ngx_type="long long"; . auto/types/sizeof
-+ngx_type="long long"; ngx_param="LONG_LONG"; . auto/types/sizeof
-
--ngx_type="void *"; . auto/types/sizeof; ngx_ptr_size=$ngx_size
-+ngx_type="void *"; ngx_param="PTR_SIZE"; . auto/types/sizeof; ngx_ptr_size=$ngx_size
- ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value
-
-
-@@ -604,7 +604,7 @@ NGX_INCLUDE_AUTO_CONFIG_H="#include \"ng
- ngx_type="uint32_t"; ngx_types="u_int32_t"; . auto/types/typedef
- ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef
-
--ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef
-+ngx_type="sig_atomic_t"; ngx_param="SIG_ATOMIC_T"; ngx_types="int"; . auto/types/typedef
- . auto/types/sizeof
- ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value
-
-@@ -620,15 +620,15 @@ ngx_type="rlim_t"; ngx_types="int"; . au
-
- . auto/endianness
-
--ngx_type="size_t"; . auto/types/sizeof
-+ngx_type="size_t"; ngx_param="SIZE_T"; . auto/types/sizeof
- ngx_param=NGX_MAX_SIZE_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
- ngx_param=NGX_SIZE_T_LEN; ngx_value=$ngx_max_len; . auto/types/value
-
--ngx_type="off_t"; . auto/types/sizeof
-+ngx_type="off_t"; ngx_param="OFF_T"; . auto/types/sizeof
- ngx_param=NGX_MAX_OFF_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
- ngx_param=NGX_OFF_T_LEN; ngx_value=$ngx_max_len; . auto/types/value
-
--ngx_type="time_t"; . auto/types/sizeof
-+ngx_type="time_t"; ngx_param="TIME_T"; . auto/types/sizeof
- ngx_param=NGX_TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value
- ngx_param=NGX_TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value
- ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
OpenPOWER on IntegriCloud