[oe] [meta-networking][PATCH] tcpdump: remove unnecessary patch

Jose Alarcon jose.alarcon at ge.com
Thu Aug 3 05:24:54 UTC 2017


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.
---
 .../tcpdump/tcpdump/tcpdump-configure-dlpi.patch   | 31 ----------------------
 .../recipes-support/tcpdump/tcpdump_4.9.0.bb       |  1 -
 2 files changed, 32 deletions(-)
 delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch

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 50e2d54..0000000
--- 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 at 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 43e388c..c7123d7 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 \
 "
-- 
2.10.1




More information about the Openembedded-devel mailing list