Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | Upstream-Status: Pending |
| 2 | |
| 3 | Subject: e2fsprogs: fix cross compilation problem |
| 4 | |
| 5 | The checking of types in parse-types.sh doesn't make much sense in a |
| 6 | cross-compilation environment, because the generated binary is executed |
| 7 | on build machine. |
| 8 | |
| 9 | So even if asm_types.h has got correct statements for types, it's possible |
| 10 | that the generated binary will report an error. Because these types are for |
| 11 | the target machine. |
| 12 | |
| 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 14 | --- |
| 15 | config/parse-types.sh | 6 ++++-- |
| 16 | configure.in | 6 +++++- |
| 17 | 2 files changed, 9 insertions(+), 3 deletions(-) |
| 18 | |
| 19 | diff --git a/config/parse-types.sh b/config/parse-types.sh |
| 20 | index 5076f6c..24d2a99 100755 |
| 21 | --- a/config/parse-types.sh |
| 22 | +++ b/config/parse-types.sh |
| 23 | @@ -118,8 +118,10 @@ if ./asm_types |
| 24 | then |
| 25 | true |
| 26 | else |
| 27 | - echo "Problem detected with asm_types.h" |
| 28 | - echo "" > asm_types.h |
| 29 | + if [ "${CROSS_COMPILE}" != "1" ]; then |
| 30 | + echo "Problem detected with asm_types.h" |
| 31 | + echo "" > asm_types.h |
| 32 | + fi |
| 33 | fi |
| 34 | rm asm_types.c asm_types |
| 35 | |
| 36 | diff --git a/configure.in b/configure.in |
| 37 | index 68adf0d..ed1697b 100644 |
| 38 | --- a/configure.in |
| 39 | +++ b/configure.in |
| 40 | @@ -953,7 +953,11 @@ AC_SUBST(SIZEOF_LONG) |
| 41 | AC_SUBST(SIZEOF_LONG_LONG) |
| 42 | AC_SUBST(SIZEOF_OFF_T) |
| 43 | AC_C_BIGENDIAN |
| 44 | -BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh |
| 45 | +if test $cross_compiling = no; then |
| 46 | + BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh |
| 47 | +else |
| 48 | + CROSS_COMPILE="1" BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh |
| 49 | +fi |
| 50 | ASM_TYPES_HEADER=./asm_types.h |
| 51 | AC_SUBST_FILE(ASM_TYPES_HEADER) |
| 52 | dnl |
| 53 | -- |
| 54 | 1.7.9.5 |
| 55 | |