diff options
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch | 31 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb | 1 |
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 @@ | |||
| 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 | |||
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" | |||
| 8 | SRC_URI = " \ | 8 | SRC_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 | " |
