| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From be9970aa16c5142ef814531d74a07990a8e9eb14 Mon Sep 17 00:00:00 2001 |
| 2 | From: Derek Straka <derek@asterius.io> |
| 3 | Date: Fri, 1 Dec 2017 10:32:29 -0500 |
| 4 | Subject: [PATCH] Allow the overriding of the endianness via the configure flag |
| 5 | --with-endian |
| 6 | |
| 7 | The existing configure options contain the --with-endian; however, the command |
| 8 | line flag does not actually function. It does not set the endianness and it |
| 9 | appears to do nothing. |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | |
| 13 | Signed-off-by: Derek Straka <derek@asterius.io> |
| 14 | |
| 15 | diff --git a/auto/endianness b/auto/endianness |
| 16 | index 1b552b6..be84487 100644 |
| 17 | --- a/auto/endianness |
| 18 | +++ b/auto/endianness |
| 19 | @@ -13,7 +13,13 @@ checking for system byte ordering |
| 20 | END |
| 21 | |
| 22 | |
| 23 | -cat << END > $NGX_AUTOTEST.c |
| 24 | +if [ ".$NGX_WITH_ENDIAN" = ".little" ]; then |
| 25 | + echo " little endian" |
| 26 | + have=NGX_HAVE_LITTLE_ENDIAN . auto/have |
| 27 | +elif [ ".$NGX_WITH_ENDIAN" = ".big" ]; then |
| 28 | + echo " big endian" |
| 29 | +else |
| 30 | + cat << END > $NGX_AUTOTEST.c |
| 31 | |
| 32 | int main(void) { |
| 33 | int i = 0x11223344; |
| 34 | @@ -26,25 +32,26 @@ int main(void) { |
| 35 | |
| 36 | END |
| 37 | |
| 38 | -ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ |
| 39 | - -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" |
| 40 | + ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ |
| 41 | + -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" |
| 42 | |
| 43 | -eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" |
| 44 | + eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" |
| 45 | |
| 46 | -if [ -x $NGX_AUTOTEST ]; then |
| 47 | - if $NGX_AUTOTEST >/dev/null 2>&1; then |
| 48 | - echo " little endian" |
| 49 | - have=NGX_HAVE_LITTLE_ENDIAN . auto/have |
| 50 | - else |
| 51 | - echo " big endian" |
| 52 | - fi |
| 53 | + if [ -x $NGX_AUTOTEST ]; then |
| 54 | + if $NGX_AUTOTEST >/dev/null 2>&1; then |
| 55 | + echo " little endian" |
| 56 | + have=NGX_HAVE_LITTLE_ENDIAN . auto/have |
| 57 | + else |
| 58 | + echo " big endian" |
| 59 | + fi |
| 60 | |
| 61 | - rm -rf $NGX_AUTOTEST* |
| 62 | + rm -rf $NGX_AUTOTEST* |
| 63 | |
| 64 | -else |
| 65 | - rm -rf $NGX_AUTOTEST* |
| 66 | + else |
| 67 | + rm -rf $NGX_AUTOTEST* |
| 68 | |
| 69 | - echo |
| 70 | - echo "$0: error: cannot detect system byte ordering" |
| 71 | - exit 1 |
| 72 | + echo |
| 73 | + echo "$0: error: cannot detect system byte ordering" |
| 74 | + exit 1 |
| 75 | + fi |
| 76 | fi |
| 77 | -- |
| 78 | 2.7.4 |
| 79 | |
| 80 | |