aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorJose Alarcon <jose.alarcon@ge.com>2017-08-03 08:24:54 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-31 14:59:51 +0200
commitab22cc42bde17ec41004afff42a6ea0311061046 (patch)
treea8f4db2250cac65cdc058f429fc84f15a2ceabe9 /meta-networking
parent60b2801024fdd019e40f4d726c3db3814c207a33 (diff)
downloadmeta-openembedded-contrib-ab22cc42bde17ec41004afff42a6ea0311061046.tar.gz
meta-openembedded-contrib-ab22cc42bde17ec41004afff42a6ea0311061046.tar.bz2
meta-openembedded-contrib-ab22cc42bde17ec41004afff42a6ea0311061046.zip
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>
Diffstat (limited to 'meta-networking')
-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 50e2d54399..0000000000
--- a/meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-[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
-
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 43e388ccc7..c7123d799c 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"
SRC_URI = " \
http://www.tcpdump.org/release/${BP}.tar.gz \
file://unnecessary-to-check-libpcap.patch \
- file://tcpdump-configure-dlpi.patch \
file://add-ptest.patch \
file://run-ptest \
"