diff options
| author | Roy Li <rongqing.li@windriver.com> | 2014-07-08 13:20:47 +0800 |
|---|---|---|
| committer | Joe MacDonald <joe_macdonald@mentor.com> | 2014-07-20 23:57:27 -0400 |
| commit | be2a2437005087b3f8d43a09ddc69991ed81e110 (patch) | |
| tree | d5ebb9df219228d8b8f8b446deab6a89c9f267a5 /meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch | |
| parent | fb70d449341acebebd160dd4c2827c2b7cf46ea3 (diff) | |
| download | meta-openembedded-be2a2437005087b3f8d43a09ddc69991ed81e110.tar.gz | |
Uprev tcpdump to 4.5.1
1. update the patch tcpdump_configure_no_-O2.patch
2. do not check libdlpi dependence on cross-compile, or else it will
cause do_qa_configure to fail.
3. do not check libpcap dependence, since the libpcap has been added
into DEPENDS, or else it will cause do_qa_configure to fail
4. make the check of getaddrinfo work on cross-compile
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch')
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch deleted file mode 100644 index 7eba2c5a6d..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | --- | ||
| 2 | configure.in | 12 ++++++++---- | ||
| 3 | 1 files changed, 8 insertions(+), 4 deletions(-) | ||
| 4 | |||
| 5 | diff --git a/configure.in b/configure.in | ||
| 6 | index eb3e5e8..11257c9 100644 | ||
| 7 | --- a/configure.in | ||
| 8 | +++ b/configure.in | ||
| 9 | @@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) | ||
| 10 | ipv6=no | ||
| 11 | ;; | ||
| 12 | esac ], | ||
| 13 | - | ||
| 14 | - AC_TRY_RUN([ /* AF_INET6 available check */ | ||
| 15 | +[ | ||
| 16 | + if test x"$cross_compiling" != "xyes"; then | ||
| 17 | + AC_TRY_RUN([ /* AF_INET6 avalable check */ | ||
| 18 | #include <sys/types.h> | ||
| 19 | #include <sys/socket.h> | ||
| 20 | main() | ||
| 21 | @@ -201,7 +202,10 @@ main() | ||
| 22 | ipv6=no], | ||
| 23 | [ AC_MSG_RESULT(no) | ||
| 24 | ipv6=no] | ||
| 25 | -)) | ||
| 26 | + ) | ||
| 27 | +else | ||
| 28 | + AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) | ||
| 29 | +fi]) | ||
| 30 | |||
| 31 | ipv6type=unknown | ||
| 32 | ipv6lib=none | ||
| 33 | @@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then | ||
| 34 | fi | ||
| 35 | |||
| 36 | |||
| 37 | -if test "$ipv6" = "yes"; then | ||
| 38 | +if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then | ||
| 39 | # | ||
| 40 | # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" | ||
| 41 | # function in libc; there are "ngetaddrinfo()" and | ||
