summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support/tcpdump
diff options
context:
space:
mode:
authorJose Alarcon <jose.alarcon@ge.com>2017-08-03 08:24:54 +0300
committerJoe MacDonald <joe_macdonald@mentor.com>2017-09-12 10:37:18 -0400
commit61880abdac6b9fee21689c8df486901c777b9f88 (patch)
tree82cc845f26409f8854c26df248a172cd634c07a1 /meta-networking/recipes-support/tcpdump
parent2cc2723700b4308f4e2864b6884a8955b4873119 (diff)
downloadmeta-openembedded-61880abdac6b9fee21689c8df486901c777b9f88.tar.gz
tcpdump: remove unnecessary patch
The removed patch added an unncessary (and incorrect) test for cross compiling: if there is no libdlpi on the target, the test will fail (as it should) and not add libdlpi to the list of libraries. If we would be cross compiling for Solaris (e.g., compiling for SPARC on Solaris x86 or for x86 on Solaris SPARC), we should check for libdlpi. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/tcpdump')
-rw-r--r--meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch31
-rw-r--r--meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb1
2 files changed, 0 insertions, 32 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch b/meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch
deleted file mode 100644
index 50e2d5439..000000000
--- a/meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1[PATCH] tcpdump: cross-compiling not check dlpi.
2
3For cross-compiling on Linux platforms, we do not need to check libdlpi
4since it is only placed on Solaris.
5Also, checking libdlpi in native /lib would cause do_qa_configure fail.
6
7Upstream-Status: Pending.
8
9Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
10---
11 configure.in | 4 +++-
12 1 files changed, 3 insertions(+), 1 deletions(-)
13
14diff --git a/configure.in b/configure.in
15index 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--
301.7.5.4
31
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb
index 43e388ccc..c7123d799 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb
@@ -8,7 +8,6 @@ DEPENDS = "libpcap"
8SRC_URI = " \ 8SRC_URI = " \
9 http://www.tcpdump.org/release/${BP}.tar.gz \ 9 http://www.tcpdump.org/release/${BP}.tar.gz \
10 file://unnecessary-to-check-libpcap.patch \ 10 file://unnecessary-to-check-libpcap.patch \
11 file://tcpdump-configure-dlpi.patch \
12 file://add-ptest.patch \ 11 file://add-ptest.patch \
13 file://run-ptest \ 12 file://run-ptest \
14" 13"