Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From cd0f7f10a3fffbc60fe55eb200474d13fe1da65b Mon Sep 17 00:00:00 2001 |
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Fri, 7 Aug 2015 10:34:29 +0300 |
| 4 | Subject: [PATCH 2/4] Provide cross compile alternatives for AC_TRY_RUN |
| 5 | |
| 6 | Modified from patch by Maarten ter Huurne. |
| 7 | |
| 8 | Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?43223] |
| 9 | |
| 10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 11 | --- |
| 12 | configure.ac | 32 ++++++++++++++++++++------------ |
| 13 | 1 file changed, 20 insertions(+), 12 deletions(-) |
| 14 | |
| 15 | diff --git a/configure.ac b/configure.ac |
| 16 | index 27690a6..ce89f56 100644 |
| 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
| 19 | @@ -348,7 +348,8 @@ main() |
| 20 | exit(0); |
| 21 | } |
| 22 | ], AC_NOTE(- your fifos are usable) fifo=1, |
| 23 | -AC_NOTE(- your fifos are not usable)) |
| 24 | +AC_NOTE(- your fifos are not usable), |
| 25 | +AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1) |
| 26 | rm -f /tmp/conftest* |
| 27 | |
| 28 | if test -n "$fifo"; then |
| 29 | @@ -396,7 +397,8 @@ main() |
| 30 | exit(0); |
| 31 | } |
| 32 | ], AC_NOTE(- your implementation is ok), |
| 33 | -AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1) |
| 34 | +AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1, |
| 35 | +AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok)) |
| 36 | rm -f /tmp/conftest* |
| 37 | fi |
| 38 | |
| 39 | @@ -458,7 +460,8 @@ main() |
| 40 | exit(0); |
| 41 | } |
| 42 | ], AC_NOTE(- your sockets are usable) sock=1, |
| 43 | -AC_NOTE(- your sockets are not usable)) |
| 44 | +AC_NOTE(- your sockets are not usable), |
| 45 | +AC_NOTE(- skipping check because we are cross compiling; assuming sockets are usable) sock=1) |
| 46 | rm -f /tmp/conftest* |
| 47 | |
| 48 | if test -n "$sock"; then |
| 49 | @@ -497,7 +500,8 @@ main() |
| 50 | } |
| 51 | ],AC_NOTE(- you are normal), |
| 52 | AC_NOTE(- unix domain sockets are not kept in the filesystem) |
| 53 | -AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1) |
| 54 | +AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1, |
| 55 | +AC_NOTE(- skipping check because we are cross compiling; assuming sockets are normal)) |
| 56 | rm -f /tmp/conftest* |
| 57 | fi |
| 58 | |
| 59 | @@ -624,7 +628,8 @@ main() |
| 60 | exit(0); |
| 61 | } |
| 62 | ],AC_NOTE(- select is ok), |
| 63 | -AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN)) |
| 64 | +AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN), |
| 65 | +AC_NOTE(- skipping check because we are cross compiling; assuming select is ok)) |
| 66 | |
| 67 | dnl |
| 68 | dnl **** termcap or terminfo **** |
| 69 | @@ -666,7 +671,8 @@ main() |
| 70 | { |
| 71 | exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); |
| 72 | }], AC_NOTE(- you use the termcap database), |
| 73 | -AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO)) |
| 74 | +AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO), |
| 75 | +AC_NOTE(- skipping check because we are cross compiling; assuming terminfo database is used) AC_DEFINE(TERMINFO)) |
| 76 | AC_CHECKING(ospeed) |
| 77 | AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) |
| 78 | |
| 79 | @@ -801,7 +807,8 @@ main() |
| 80 | else |
| 81 | AC_NOTE(- can't determine - assume ptys are world accessable) |
| 82 | fi |
| 83 | - ] |
| 84 | + ], |
| 85 | + AC_NOTE(- skipping check because we are cross compiling; assuming ptys are world accessable) |
| 86 | ) |
| 87 | rm -f conftest_grp |
| 88 | fi |
| 89 | @@ -885,7 +892,7 @@ AC_EGREP_CPP(yes, |
| 90 | #endif |
| 91 | ], load=1) |
| 92 | fi |
| 93 | -if test -z "$load" ; then |
| 94 | +if test -z "$load" && test "$cross_compiling" = no ; then |
| 95 | AC_CHECKING(for kernelfile) |
| 96 | for core in /unix /vmunix /dynix /hp-ux /xelos /dev/ksyms /kernel/unix /kernel/genunix /unicos /mach /netbsd /386bsd /dgux /bsd /stand/vmunix; do |
| 97 | if test -f $core || test -c $core; then |
| 98 | @@ -1078,7 +1085,7 @@ main() |
| 99 | #endif |
| 100 | exit(0); |
| 101 | } |
| 102 | -],,AC_DEFINE(SYSVSIGS)) |
| 103 | +],,AC_DEFINE(SYSVSIGS),:) |
| 104 | |
| 105 | fi |
| 106 | |
| 107 | @@ -1158,7 +1165,7 @@ main() { |
| 108 | if (strncmp(buf, "cdedef", 6)) |
| 109 | exit(1); |
| 110 | exit(0); /* libc version works properly. */ |
| 111 | -}], AC_DEFINE(USEBCOPY)) |
| 112 | +}], AC_DEFINE(USEBCOPY),,:) |
| 113 | |
| 114 | AC_TRY_RUN([ |
| 115 | #define bcopy(s,d,l) memmove(d,s,l) |
| 116 | @@ -1173,7 +1180,8 @@ main() { |
| 117 | if (strncmp(buf, "cdedef", 6)) |
| 118 | exit(1); |
| 119 | exit(0); /* libc version works properly. */ |
| 120 | -}], AC_DEFINE(USEMEMMOVE)) |
| 121 | +}], AC_DEFINE(USEMEMMOVE),, |
| 122 | + AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE)) |
| 123 | |
| 124 | |
| 125 | AC_TRY_RUN([ |
| 126 | @@ -1189,7 +1197,7 @@ main() { |
| 127 | if (strncmp(buf, "cdedef", 6)) |
| 128 | exit(1); |
| 129 | exit(0); /* libc version works properly. */ |
| 130 | -}], AC_DEFINE(USEMEMCPY)) |
| 131 | +}], AC_DEFINE(USEMEMCPY),,:) |
| 132 | |
| 133 | AC_SYS_LONG_FILE_NAMES |
| 134 | |
| 135 | -- |
| 136 | 2.1.4 |
| 137 | |