1*4882a593SmuzhiyunFrom 194ec61843b9598ce90873c812b817c4b96e2e0d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Baruch Siach <baruch@tkos.co.il> 3*4882a593SmuzhiyunDate: Thu, 2 Sep 2021 12:56:00 +0300 4*4882a593SmuzhiyunSubject: [PATCH] Detect libpcap dependencies using pkg-config 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunWhen building statically the link command line must include all 7*4882a593Smuzhiyundependencies of all libraries. libpcap can optionally depend on libnl. 8*4882a593Smuzhiyunmausezahn can't build statically in this case. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunUse pkg-config in configure and in the link command to construct the 11*4882a593Smuzhiyunlibrary flags we need to link with libpcap. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Baruch Siach <baruch@tkos.co.il> 14*4882a593SmuzhiyunSigned-off-by: Tobias Klauser <tklauser@distanz.ch> 15*4882a593Smuzhiyun--- 16*4882a593SmuzhiyunUpstream status: commit 194ec61843b9598ce90873c812b817c4b96e2e0d 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun configure | 4 +++- 19*4882a593Smuzhiyun mausezahn/Makefile | 2 +- 20*4882a593Smuzhiyun 2 files changed, 4 insertions(+), 2 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/configure b/configure 23*4882a593Smuzhiyunindex 510826a798f5..598ae2433a7a 100755 24*4882a593Smuzhiyun--- a/configure 25*4882a593Smuzhiyun+++ b/configure 26*4882a593Smuzhiyun@@ -588,7 +588,9 @@ int main(void) 27*4882a593Smuzhiyun } 28*4882a593Smuzhiyun EOF 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun- $CC -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c -lpcap >> config.log 2>&1 31*4882a593Smuzhiyun+ $CC -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c \ 32*4882a593Smuzhiyun+ $($PKG_CONFIG --libs libpcap 2>> config.log) \ 33*4882a593Smuzhiyun+ >> config.log 2>&1 34*4882a593Smuzhiyun if [ ! -x $TMPDIR/pcaptest ] ; then 35*4882a593Smuzhiyun echo "[NO]" 36*4882a593Smuzhiyun echo "CONFIG_LIBPCAP=0" >> Config 37*4882a593Smuzhiyundiff --git a/mausezahn/Makefile b/mausezahn/Makefile 38*4882a593Smuzhiyunindex ca16b6579583..9544565355cc 100644 39*4882a593Smuzhiyun--- a/mausezahn/Makefile 40*4882a593Smuzhiyun+++ b/mausezahn/Makefile 41*4882a593Smuzhiyun@@ -1,6 +1,6 @@ 42*4882a593Smuzhiyun mausezahn-libs = -lcli \ 43*4882a593Smuzhiyun -lnet \ 44*4882a593Smuzhiyun- -lpcap \ 45*4882a593Smuzhiyun+ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libpcap 2> /dev/null ) \ 46*4882a593Smuzhiyun -lrt \ 47*4882a593Smuzhiyun -lpthread \ 48*4882a593Smuzhiyun -lm 49*4882a593Smuzhiyun-- 50*4882a593Smuzhiyun2.33.0 51*4882a593Smuzhiyun 52