From patchwork Thu Nov 22 00:17:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 200891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 5111D2C0093 for ; Thu, 22 Nov 2012 11:20:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AEE9984787; Thu, 22 Nov 2012 00:20:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id shgA6+m1AaOd; Thu, 22 Nov 2012 00:19:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BB705840A2; Thu, 22 Nov 2012 00:19:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 06FB28F74A for ; Thu, 22 Nov 2012 00:19:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ABFAE8CD36 for ; Thu, 22 Nov 2012 00:18:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zlor3T4fKHhn for ; Thu, 22 Nov 2012 00:18:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 861AB8CD35 for ; Thu, 22 Nov 2012 00:18:44 +0000 (UTC) Received: by mail-wi0-f171.google.com with SMTP id hn14so263655wib.10 for ; Wed, 21 Nov 2012 16:18:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=ojDW9iLidFqA1Fho72O8LqQuR5r2JaLd7t8vc/JPbBs=; b=CIPDG9BlO1wE1FIJpA5Yf5nTnJxo9Hf4B+yQ/nROf4soRlnH7LqAPno5zH6HKDAnnM OX6f6HaSVhiTM5NovlUeXWySa8XhnW9kuW6kk2sj9JtJdDnOySeO38uFfjp7z/aCQ3ak Q1FjEyQ0T9+WMhaFyzr3TrEyAYZ02oAu7XjZpsVXBG2fZUz4YoAEqpwM4JPc+/uQm7bD SwP+em0PFs+i6xjRcMyNNbHrsZY7Rw8ssaoShbvR6kPi5sWjHcFzeX4voUYsFrooNCZp bFvDUPsCqpjeU9NSTiE91MGnMyLS1JB+J0HqAnAvz2cyxAbxuzVOtJbiBN6wgIEl6Zth bt9g== Received: by 10.216.136.157 with SMTP id w29mr8046544wei.148.1353543523131; Wed, 21 Nov 2012 16:18:43 -0800 (PST) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPS id r10sm1847697wiz.0.2012.11.21.16.18.41 (version=SSLv3 cipher=OTHER); Wed, 21 Nov 2012 16:18:42 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Thu, 22 Nov 2012 01:17:53 +0100 Message-Id: <1353543503-8952-4-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com> References: <1353543503-8952-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH 03/33] tcpdump: use 'pkg-config pcap' instead of pcap-config X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Samuel Martin --- ...ump-use-pkg-config-instead-of-pcap-config.patch | 68 ++++++++++++++++++++++ package/tcpdump/tcpdump.mk | 3 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch diff --git a/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch b/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch new file mode 100644 index 0000000..bd12580 --- /dev/null +++ b/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch @@ -0,0 +1,68 @@ +Use 'pkg-config pcap' instead of the pcap-config binary which does not +correctly support cross-compilation. + +Signed-off-by: Samuel Martin + +--- tcpdump-4.3.0.orig/aclocal.m4 2012-11-17 14:04:17.159100154 +0100 ++++ tcpdump-4.3.0/aclocal.m4 2012-11-17 15:28:46.319808067 +0100 +@@ -287,29 +287,13 @@ AC_DEFUN(AC_LBL_LIBPCAP, + AC_MSG_CHECKING(for local pcap library) + libpcap=FAIL + lastdir=FAIL +- places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \ +- egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'` +- for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do +- basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \ +- sed -e 's/-PRE-GIT$//' ` +- if test $lastdir = $basedir ; then +- dnl skip alphas when an actual release is present +- continue; +- fi +- lastdir=$dir +- if test -r $dir/libpcap.a ; then +- libpcap=$dir/libpcap.a +- d=$dir +- dnl continue and select the last one that exists +- fi +- done + if test $libpcap = FAIL ; then + AC_MSG_RESULT(not found) + + # + # Look for pcap-config. + # +- AC_PATH_TOOL(PCAP_CONFIG, pcap-config) ++ AC_PATH_TOOL(PCAP_CONFIG, pkg-config) + if test -n "$PCAP_CONFIG" ; then + # + # Found - use it to get the include flags for +@@ -322,9 +322,9 @@ AC_DEFUN(AC_LBL_LIBPCAP, + # double-quoted strings inside double-quoted back-quoted + # expressions (pfew!)." + # +- cflags=`"$PCAP_CONFIG" --cflags` ++ cflags=`"$PCAP_CONFIG" pcap --cflags` + $2="$cflags $$2" +- libpcap=`"$PCAP_CONFIG" --libs` ++ libpcap=`"$PCAP_CONFIG" pcap --libs` + else + # + # Not found; look for pcap. +@@ -380,7 +380,7 @@ AC_DEFUN(AC_LBL_LIBPCAP, + AC_MSG_ERROR(cannot find pcap.h, see INSTALL) + fi + AC_MSG_RESULT($libpcap) +- AC_PATH_PROG(PCAP_CONFIG, pcap-config,, $d) ++ AC_PATH_PROG(PCAP_CONFIG, pkg-config,, $d) + if test -n "$PCAP_CONFIG"; then + # + # The libpcap directory has a pcap-config script. +@@ -395,7 +395,7 @@ AC_DEFUN(AC_LBL_LIBPCAP, + # double-quoted strings inside double-quoted back-quoted + # expressions (pfew!)." + # +- additional_libs=`"$PCAP_CONFIG" --additional-libs --static` ++ additional_libs=`"$PCAP_CONFIG" pcap --libs --static` + libpcap="$libpcap $additional_libs" + fi + fi diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 96414ef..72def58 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -11,10 +11,11 @@ TCPDUMP_SITE = http://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3c TCPDUMP_LICENSE_FILES = LICENSE +TCPDUMP_AUTORECONF = YES TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no TCPDUMP_CONF_OPT = --without-crypto \ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb) -TCPDUMP_DEPENDENCIES = zlib libpcap +TCPDUMP_DEPENDENCIES = host-pkgconf zlib libpcap # make install installs an unneeded extra copy of the tcpdump binary define TCPDUMP_REMOVE_DUPLICATED_BINARY