diff --git a/network/nginx/allow_cross.patch b/network/nginx/allow_cross.patch new file mode 100644 index 000000000..f8cfb4916 --- /dev/null +++ b/network/nginx/allow_cross.patch @@ -0,0 +1,47 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../nginx/allow_cross.patch +# Copyright (C) 2009 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./auto/types/sizeof.orig 2009-09-02 15:57:09.264008454 -0400 ++++ ./auto/types/sizeof 2009-09-02 16:10:29.856009072 -0400 +@@ -38,8 +38,14 @@ + + + if [ -x $NGX_AUTOTEST ]; then +- ngx_size=`$NGX_AUTOTEST` ++ cachename=$(echo "ngx_cache_sizeof_$ngx_type" | tr ' *' '_p') ++ cacheval=$(eval echo "\$$cachename") ++ if [ -n "$cacheval" ]; then ++ ngx_size="$cacheval" ++ else ++ ngx_size=`$NGX_AUTOTEST` ++ fi + echo " $ngx_size bytes" + fi + + +--- ./auto/feature.orig 2009-09-03 07:10:21.608009461 -0400 ++++ ./auto/feature 2009-09-03 07:15:24.048354979 -0400 +@@ -48,6 +48,10 @@ + + if [ -x $NGX_AUTOTEST ]; then + ++ if [ "$cross_compiling" = "yes" ]; then ++ ngx_feature_run=no ++ fi ++ + case "$ngx_feature_run" in + + yes) diff --git a/network/nginx/nginx.conf b/network/nginx/nginx.conf index 8c88fe6ec..0b4310814 100644 --- a/network/nginx/nginx.conf +++ b/network/nginx/nginx.conf @@ -19,7 +19,7 @@ if [ $prefix_auto = 1 ]; then fi cleanconfopt=0 -confopt="--prefix=$root/$prefix" +confopt="--prefix=/$prefix" [[ "$sysconfdir" = */$pkg ]] || sysconfdir=$sysconfdir/$pkg @@ -59,3 +59,12 @@ done for x in stub_status flv realip; do var_append confopt ' ' "--with-http_${x}_module" done + +if atstage cross; then + var_append configprefix ' ' 'cross_compiling=yes' + + for x in int long long_long char_p:void_p int:sig_atomic_t int:size_t int:off_t int:time_t; do + y=$(eval echo "\$arch_sizeof_${x%:*}") + var_append configprefix ' ' "ngx_cache_sizeof_${x#*:}=$y" + done +fi diff --git a/network/nginx/nginx.desc b/network/nginx/nginx.desc index 74a767e9a..cb2a49054 100644 --- a/network/nginx/nginx.desc +++ b/network/nginx/nginx.desc @@ -43,7 +43,6 @@ [L] GPL [S] Stable [V] 0.7.61 -[P] X -----5---9 800.000 +[P] X -?---5---9 800.000 [D] 1817630261 nginx-0.7.61.tar.gz http://sysoev.ru/nginx/ -