xref: /openbmc/openbmc/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch (revision eb8dc40360f0cfef56fb6947cc817a547d6d9bc6)
1*eb8dc403SDave CobbleyWe do not have capability to run binaries when cross compiling
2*eb8dc403SDave Cobbley
3*eb8dc403SDave CobbleyUpstream-Status: Pending
4*eb8dc403SDave Cobbley
5*eb8dc403SDave Cobbley
6*eb8dc403SDave CobbleyIndex: nginx-1.12.2/auto/feature
7*eb8dc403SDave Cobbley===================================================================
8*eb8dc403SDave Cobbley--- nginx-1.12.2.orig/auto/feature
9*eb8dc403SDave Cobbley+++ nginx-1.12.2/auto/feature
10*eb8dc403SDave Cobbley@@ -49,12 +49,20 @@ eval "/bin/sh -c \"$ngx_test\" >> $NGX_A
11*eb8dc403SDave Cobbley
12*eb8dc403SDave Cobbley if [ -x $NGX_AUTOTEST ]; then
13*eb8dc403SDave Cobbley
14*eb8dc403SDave Cobbley+    if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then
15*eb8dc403SDave Cobbley+        NGX_AUTOTEST_EXEC="true"
16*eb8dc403SDave Cobbley+	NGX_FOUND_MSG=" (not tested, cross compiling)"
17*eb8dc403SDave Cobbley+    else
18*eb8dc403SDave Cobbley+        NGX_AUTOTEST_EXEC="$NGX_AUTOTEST"
19*eb8dc403SDave Cobbley+	NGX_FOUND_MSG=""
20*eb8dc403SDave Cobbley+    fi
21*eb8dc403SDave Cobbley+
22*eb8dc403SDave Cobbley     case "$ngx_feature_run" in
23*eb8dc403SDave Cobbley
24*eb8dc403SDave Cobbley         yes)
25*eb8dc403SDave Cobbley             # /bin/sh is used to intercept "Killed" or "Abort trap" messages
26*eb8dc403SDave Cobbley-            if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
27*eb8dc403SDave Cobbley-                echo " found"
28*eb8dc403SDave Cobbley+            if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then
29*eb8dc403SDave Cobbley+                echo " found$NGX_FOUND_MSG"
30*eb8dc403SDave Cobbley                 ngx_found=yes
31*eb8dc403SDave Cobbley
32*eb8dc403SDave Cobbley                 if test -n "$ngx_feature_name"; then
33*eb8dc403SDave Cobbley@@ -68,17 +76,27 @@ if [ -x $NGX_AUTOTEST ]; then
34*eb8dc403SDave Cobbley
35*eb8dc403SDave Cobbley         value)
36*eb8dc403SDave Cobbley             # /bin/sh is used to intercept "Killed" or "Abort trap" messages
37*eb8dc403SDave Cobbley-            if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
38*eb8dc403SDave Cobbley-                echo " found"
39*eb8dc403SDave Cobbley+            if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then
40*eb8dc403SDave Cobbley+                echo " found$NGX_FOUND_MSG"
41*eb8dc403SDave Cobbley                 ngx_found=yes
42*eb8dc403SDave Cobbley
43*eb8dc403SDave Cobbley-                cat << END >> $NGX_AUTO_CONFIG_H
44*eb8dc403SDave Cobbley+                if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then
45*eb8dc403SDave Cobbley+                    cat << END >> $NGX_AUTO_CONFIG_H
46*eb8dc403SDave Cobbley
47*eb8dc403SDave Cobbley #ifndef $ngx_feature_name
48*eb8dc403SDave Cobbley-#define $ngx_feature_name  `$NGX_AUTOTEST`
49*eb8dc403SDave Cobbley+#define $ngx_feature_name  $(eval "echo \$NGX_WITH_${ngx_feature_name}")
50*eb8dc403SDave Cobbley #endif
51*eb8dc403SDave Cobbley
52*eb8dc403SDave Cobbley END
53*eb8dc403SDave Cobbley+		else
54*eb8dc403SDave Cobbley+                    cat << END >> $NGX_AUTO_CONFIG_H
55*eb8dc403SDave Cobbley+
56*eb8dc403SDave Cobbley+#ifndef $ngx_feature_name
57*eb8dc403SDave Cobbley+#define $ngx_feature_name  `$NGX_AUTOTEST_EXEC`
58*eb8dc403SDave Cobbley+#endif
59*eb8dc403SDave Cobbley+
60*eb8dc403SDave Cobbley+END
61*eb8dc403SDave Cobbley+                fi
62*eb8dc403SDave Cobbley             else
63*eb8dc403SDave Cobbley                 echo " found but is not working"
64*eb8dc403SDave Cobbley             fi
65*eb8dc403SDave Cobbley@@ -86,7 +104,7 @@ END
66*eb8dc403SDave Cobbley
67*eb8dc403SDave Cobbley         bug)
68*eb8dc403SDave Cobbley             # /bin/sh is used to intercept "Killed" or "Abort trap" messages
69*eb8dc403SDave Cobbley-            if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
70*eb8dc403SDave Cobbley+            if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then
71*eb8dc403SDave Cobbley                 echo " not found"
72*eb8dc403SDave Cobbley
73*eb8dc403SDave Cobbley             else
74*eb8dc403SDave CobbleyIndex: nginx-1.12.2/auto/options
75*eb8dc403SDave Cobbley===================================================================
76*eb8dc403SDave Cobbley--- nginx-1.12.2.orig/auto/options
77*eb8dc403SDave Cobbley+++ nginx-1.12.2/auto/options
78*eb8dc403SDave Cobbley@@ -386,6 +386,18 @@ $0: warning: the \"--with-sha1-asm\" opt
79*eb8dc403SDave Cobbley         --test-build-epoll)              NGX_TEST_BUILD_EPOLL=YES   ;;
80*eb8dc403SDave Cobbley         --test-build-solaris-sendfilev)  NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
81*eb8dc403SDave Cobbley
82*eb8dc403SDave Cobbley+        # cross compile support
83*eb8dc403SDave Cobbley+        --with-int=*)                    NGX_WITH_INT="$value"          ;;
84*eb8dc403SDave Cobbley+        --with-long=*)                   NGX_WITH_LONG="$value"         ;;
85*eb8dc403SDave Cobbley+        --with-long-long=*)              NGX_WITH_LONG_LONG="$value"    ;;
86*eb8dc403SDave Cobbley+        --with-ptr-size=*)               NGX_WITH_PTR_SIZE="$value"     ;;
87*eb8dc403SDave Cobbley+        --with-sig-atomic-t=*)           NGX_WITH_SIG_ATOMIC_T="$value" ;;
88*eb8dc403SDave Cobbley+        --with-size-t=*)                 NGX_WITH_SIZE_T="$value"       ;;
89*eb8dc403SDave Cobbley+        --with-off-t=*)                  NGX_WITH_OFF_T="$value"        ;;
90*eb8dc403SDave Cobbley+        --with-time-t=*)                 NGX_WITH_TIME_T="$value"       ;;
91*eb8dc403SDave Cobbley+        --with-sys-nerr=*)               NGX_WITH_NGX_SYS_NERR="$value" ;;
92*eb8dc403SDave Cobbley+        --with-endian=*)                 NGX_WITH_ENDIAN="$value"       ;;
93*eb8dc403SDave Cobbley+
94*eb8dc403SDave Cobbley         *)
95*eb8dc403SDave Cobbley             echo "$0: error: invalid option \"$option\""
96*eb8dc403SDave Cobbley             exit 1
97*eb8dc403SDave Cobbley@@ -568,6 +580,17 @@ cat << END
98*eb8dc403SDave Cobbley
99*eb8dc403SDave Cobbley   --with-debug                       enable debug logging
100*eb8dc403SDave Cobbley
101*eb8dc403SDave Cobbley+  --with-int=VALUE                   force int size
102*eb8dc403SDave Cobbley+  --with-long=VALUE                  force long size
103*eb8dc403SDave Cobbley+  --with-long-long=VALUE             force long long size
104*eb8dc403SDave Cobbley+  --with-ptr-size=VALUE              force pointer size
105*eb8dc403SDave Cobbley+  --with-sig-atomic-t=VALUE          force sig_atomic_t size
106*eb8dc403SDave Cobbley+  --with-size-t=VALUE                force size_t size
107*eb8dc403SDave Cobbley+  --with-off-t=VALUE                 force off_t size
108*eb8dc403SDave Cobbley+  --with-time-t=VALUE                force time_t size
109*eb8dc403SDave Cobbley+  --with-sys-nerr=VALUE              force sys_nerr value
110*eb8dc403SDave Cobbley+  --with-endian=VALUE                force system endianess
111*eb8dc403SDave Cobbley+
112*eb8dc403SDave Cobbley END
113*eb8dc403SDave Cobbley
114*eb8dc403SDave Cobbley     exit 1
115*eb8dc403SDave Cobbley@@ -576,6 +599,8 @@ fi
116*eb8dc403SDave Cobbley
117*eb8dc403SDave Cobbley if [ ".$NGX_PLATFORM" = ".win32" ]; then
118*eb8dc403SDave Cobbley     NGX_WINE=$WINE
119*eb8dc403SDave Cobbley+elif [ ! -z "$NGX_PLATFORM" ]; then
120*eb8dc403SDave Cobbley+    NGX_CROSS_COMPILE="yes"
121*eb8dc403SDave Cobbley fi
122*eb8dc403SDave Cobbley
123*eb8dc403SDave Cobbley
124*eb8dc403SDave CobbleyIndex: nginx-1.12.2/auto/types/sizeof
125*eb8dc403SDave Cobbley===================================================================
126*eb8dc403SDave Cobbley--- nginx-1.12.2.orig/auto/types/sizeof
127*eb8dc403SDave Cobbley+++ nginx-1.12.2/auto/types/sizeof
128*eb8dc403SDave Cobbley@@ -12,9 +12,12 @@ checking for $ngx_type size
129*eb8dc403SDave Cobbley
130*eb8dc403SDave Cobbley END
131*eb8dc403SDave Cobbley
132*eb8dc403SDave Cobbley-ngx_size=
133*eb8dc403SDave Cobbley+ngx_size=$(eval "echo \$NGX_WITH_${ngx_param}")
134*eb8dc403SDave Cobbley
135*eb8dc403SDave Cobbley-cat << END > $NGX_AUTOTEST.c
136*eb8dc403SDave Cobbley+if [ ".$ngx_size" != "." ]; then
137*eb8dc403SDave Cobbley+    echo " $ngx_size bytes"
138*eb8dc403SDave Cobbley+else
139*eb8dc403SDave Cobbley+    cat << END > $NGX_AUTOTEST.c
140*eb8dc403SDave Cobbley
141*eb8dc403SDave Cobbley #include <sys/types.h>
142*eb8dc403SDave Cobbley #include <sys/time.h>
143*eb8dc403SDave Cobbley@@ -33,15 +36,16 @@ int main(void) {
144*eb8dc403SDave Cobbley END
145*eb8dc403SDave Cobbley
146*eb8dc403SDave Cobbley
147*eb8dc403SDave Cobbley-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
148*eb8dc403SDave Cobbley-          -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
149*eb8dc403SDave Cobbley+    ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
150*eb8dc403SDave Cobbley+              -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
151*eb8dc403SDave Cobbley
152*eb8dc403SDave Cobbley-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
153*eb8dc403SDave Cobbley+    eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
154*eb8dc403SDave Cobbley
155*eb8dc403SDave Cobbley
156*eb8dc403SDave Cobbley-if [ -x $NGX_AUTOTEST ]; then
157*eb8dc403SDave Cobbley-    ngx_size=`$NGX_AUTOTEST`
158*eb8dc403SDave Cobbley-    echo " $ngx_size bytes"
159*eb8dc403SDave Cobbley+    if [ -x $NGX_AUTOTEST ]; then
160*eb8dc403SDave Cobbley+        ngx_size=`$NGX_AUTOTEST`
161*eb8dc403SDave Cobbley+        echo " $ngx_size bytes"
162*eb8dc403SDave Cobbley+    fi
163*eb8dc403SDave Cobbley fi
164*eb8dc403SDave Cobbley
165*eb8dc403SDave Cobbley
166*eb8dc403SDave CobbleyIndex: nginx-1.12.2/auto/unix
167*eb8dc403SDave Cobbley===================================================================
168*eb8dc403SDave Cobbley--- nginx-1.12.2.orig/auto/unix
169*eb8dc403SDave Cobbley+++ nginx-1.12.2/auto/unix
170*eb8dc403SDave Cobbley@@ -587,13 +587,13 @@ ngx_feature_libs=
171*eb8dc403SDave Cobbley
172*eb8dc403SDave Cobbley # C types
173*eb8dc403SDave Cobbley
174*eb8dc403SDave Cobbley-ngx_type="int"; . auto/types/sizeof
175*eb8dc403SDave Cobbley+ngx_type="int"; ngx_param="INT"; . auto/types/sizeof
176*eb8dc403SDave Cobbley
177*eb8dc403SDave Cobbley-ngx_type="long"; . auto/types/sizeof
178*eb8dc403SDave Cobbley+ngx_type="long"; ngx_param="LONG"; . auto/types/sizeof
179*eb8dc403SDave Cobbley
180*eb8dc403SDave Cobbley-ngx_type="long long"; . auto/types/sizeof
181*eb8dc403SDave Cobbley+ngx_type="long long"; ngx_param="LONG_LONG"; . auto/types/sizeof
182*eb8dc403SDave Cobbley
183*eb8dc403SDave Cobbley-ngx_type="void *"; . auto/types/sizeof; ngx_ptr_size=$ngx_size
184*eb8dc403SDave Cobbley+ngx_type="void *"; ngx_param="PTR_SIZE"; . auto/types/sizeof; ngx_ptr_size=$ngx_size
185*eb8dc403SDave Cobbley ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value
186*eb8dc403SDave Cobbley
187*eb8dc403SDave Cobbley
188*eb8dc403SDave Cobbley@@ -604,7 +604,7 @@ NGX_INCLUDE_AUTO_CONFIG_H="#include \"ng
189*eb8dc403SDave Cobbley ngx_type="uint32_t"; ngx_types="u_int32_t"; . auto/types/typedef
190*eb8dc403SDave Cobbley ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef
191*eb8dc403SDave Cobbley
192*eb8dc403SDave Cobbley-ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef
193*eb8dc403SDave Cobbley+ngx_type="sig_atomic_t"; ngx_param="SIG_ATOMIC_T"; ngx_types="int"; . auto/types/typedef
194*eb8dc403SDave Cobbley . auto/types/sizeof
195*eb8dc403SDave Cobbley ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value
196*eb8dc403SDave Cobbley
197*eb8dc403SDave Cobbley@@ -620,15 +620,15 @@ ngx_type="rlim_t"; ngx_types="int"; . au
198*eb8dc403SDave Cobbley
199*eb8dc403SDave Cobbley . auto/endianness
200*eb8dc403SDave Cobbley
201*eb8dc403SDave Cobbley-ngx_type="size_t"; . auto/types/sizeof
202*eb8dc403SDave Cobbley+ngx_type="size_t"; ngx_param="SIZE_T"; . auto/types/sizeof
203*eb8dc403SDave Cobbley ngx_param=NGX_MAX_SIZE_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
204*eb8dc403SDave Cobbley ngx_param=NGX_SIZE_T_LEN; ngx_value=$ngx_max_len; . auto/types/value
205*eb8dc403SDave Cobbley
206*eb8dc403SDave Cobbley-ngx_type="off_t"; . auto/types/sizeof
207*eb8dc403SDave Cobbley+ngx_type="off_t"; ngx_param="OFF_T"; . auto/types/sizeof
208*eb8dc403SDave Cobbley ngx_param=NGX_MAX_OFF_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
209*eb8dc403SDave Cobbley ngx_param=NGX_OFF_T_LEN; ngx_value=$ngx_max_len; . auto/types/value
210*eb8dc403SDave Cobbley
211*eb8dc403SDave Cobbley-ngx_type="time_t"; . auto/types/sizeof
212*eb8dc403SDave Cobbley+ngx_type="time_t"; ngx_param="TIME_T"; . auto/types/sizeof
213*eb8dc403SDave Cobbley ngx_param=NGX_TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value
214*eb8dc403SDave Cobbley ngx_param=NGX_TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value
215*eb8dc403SDave Cobbley ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
216