CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcpreplay: improve search for libpcap

Browse Source 
Add a test to find libpcap if testdir/.. is a sysroot.

Upstream-Status: Pending

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Joe Slater 2014-12-10 14:37:08 -08:00 committed by Martin Jansa
parent edcf03b5fb
commit 2a1cbf5ca9
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-improve-search-for-libpcap.patch Normal file
View File

@ -0,0 +1,33 @@
tcpreplay: improve search for libpcap
Add a test which will find libpcap if $testdir/.. is a sysroot.
Upstream-Status: Pending
Signed-off-by: Joe Slater <joe.slater@windriver.com>
--- a/configure.ac
+++ b/configure.ac
@@ -350,14 +350,20 @@ for testdir in $trypcapdir /usr/local /o
if test -f "${testdir}/include/pcap.h" -a $foundpcap = no ; then
LPCAPINC="${testdir}/include/pcap.h"
LPCAPINCDIR="${testdir}/include"
+ # If testdir/.. is a sysroot, then sDir should point to where the libraries are.
+ sDir=$(readlink -m ${testdir}/../${libdir})
if test $dynamic_link = yes; then
- if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
+ if test -f "${sDir}/libpcap${shrext_cmds}" ; then
+ LPCAPLIB="-L${sDir} -lpcap"
+ elif test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
LPCAPLIB="-L${testdir}/lib64 -lpcap"
elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
LPCAPLIB="-L${testdir}/lib -lpcap"
else
AC_ERROR([Unable to find libpcap in ${testdir}])
fi
+ elif test -f "${sDir}/libpcap.${libext}" ; then
+ LPCAPLIB="${sDir}/libpcap.${libext}"
elif test -f "${testdir}/lib64/libpcap.${libext}" ; then
LPCAPLIB="${testdir}/lib64/libpcap.${libext}"
elif test -f "${testdir}/lib/libpcap.${libext}" ; then

1
meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb
View File

@ -10,6 +10,7 @@ SRC_URI = "http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.ta
file://tcpreplay-3.4.4-cross-compile.patch \
file://tcpreplay-3.4.4-no-bfp-support.patch \
file://tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch \
file://tcpreplay-3.4.4-improve-search-for-libpcap.patch \
"
SRC_URI[md5sum] = "22725feb9b2590809f9350308ec65180"
SRC_URI[sha256sum] = "7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f"