diff options
author | Roy Li <rongqing.li@windriver.com> | 2014-08-18 09:24:14 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-21 21:35:06 +0200 |
commit | e697845cc91244e397eff34fe9153bedf91beb0f (patch) | |
tree | e66add73740321e9c72a83f6a18bf468c9a8a9c0 /meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch | |
parent | 2139d9034d036e92566adf2fff75fa49cd531ab1 (diff) | |
download | meta-openembedded-contrib-e697845cc91244e397eff34fe9153bedf91beb0f.tar.gz |
tcpdump: uprev it to 4.6.1
1. uprev to 4.6.1
2. remove three obsolete patches
3. use PACKAGECONFIG, and the default value is ipv6 openssl
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch')
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch new file mode 100644 index 0000000000..50e2d54399 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch @@ -0,0 +1,31 @@ +[PATCH] tcpdump: cross-compiling not check dlpi. + +For cross-compiling on Linux platforms, we do not need to check libdlpi +since it is only placed on Solaris. +Also, checking libdlpi in native /lib would cause do_qa_configure fail. + +Upstream-Status: Pending. + +Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> +--- + configure.in | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 7f9591c..ca277c0 100644 +--- a/configure.in ++++ b/configure.in +@@ -716,7 +716,9 @@ don't.]) + fi + + # libdlpi is needed for Solaris 11 and later. +-AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) ++if test "$cross_compiling" != yes; then ++ AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) ++fi + + dnl portability macros for getaddrinfo/getnameinfo + dnl +-- +1.7.5.4 + |