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.5.1/tcpdump-configure-dlpi.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.5.1/tcpdump-configure-dlpi.patch')
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch new file mode 100644 index 0000000000..50e2d54399 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | [PATCH] tcpdump: cross-compiling not check dlpi. | ||
2 | |||
3 | For cross-compiling on Linux platforms, we do not need to check libdlpi | ||
4 | since it is only placed on Solaris. | ||
5 | Also, checking libdlpi in native /lib would cause do_qa_configure fail. | ||
6 | |||
7 | Upstream-Status: Pending. | ||
8 | |||
9 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
10 | --- | ||
11 | configure.in | 4 +++- | ||
12 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/configure.in b/configure.in | ||
15 | index 7f9591c..ca277c0 100644 | ||
16 | --- a/configure.in | ||
17 | +++ b/configure.in | ||
18 | @@ -716,7 +716,9 @@ don't.]) | ||
19 | fi | ||
20 | |||
21 | # libdlpi is needed for Solaris 11 and later. | ||
22 | -AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) | ||
23 | +if test "$cross_compiling" != yes; then | ||
24 | + AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) | ||
25 | +fi | ||
26 | |||
27 | dnl portability macros for getaddrinfo/getnameinfo | ||
28 | dnl | ||
29 | -- | ||
30 | 1.7.5.4 | ||
31 | |||