From patchwork Wed Oct 24 14:13:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 193796 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 500EE2C0091 for ; Thu, 25 Oct 2012 01:14:08 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 91E0A8C0EB; Wed, 24 Oct 2012 14:14:04 +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 e+PIwyogsQeH; Wed, 24 Oct 2012 14:13:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id AE3C989C5B; Wed, 24 Oct 2012 14:13:53 +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 404CA8F74A for ; Wed, 24 Oct 2012 14:13:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CDBD78C460 for ; Wed, 24 Oct 2012 14:13:51 +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 iBnrJH+Hyv19 for ; Wed, 24 Oct 2012 14:13:44 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from sivan.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTP id 1F1A98C740 for ; Wed, 24 Oct 2012 14:13:42 +0000 (UTC) Received: from sapphire.alvarion.com (taragon.tkos.co.il [10.0.4.3]) by sivan.tkos.co.il (Postfix) with ESMTP id 66D44B4F7B; Wed, 24 Oct 2012 16:13:40 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Wed, 24 Oct 2012 16:13:33 +0200 Message-Id: <4b73cf9536d6cde485299c9afb9fc41affa909ae.1351087817.git.baruch@tkos.co.il> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH v2] wireshark: new package 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 This is only the bare minimum needed to build the textual tshark utility. Support for more options, including the wireshark GUI, can be added later. Signed-off-by: Baruch Siach --- Changes v1 -> v2: * Patch configure.in and enable autoreconf, instead of overriding $prefix * Remove --with-sysroot as suggested by Arnout Vandecappelle The tshark RPATH is still cluttered with local build paths. Adding --libdir=/usr/lib doesn't solve this. Any suggestion? package/Config.in | 1 + package/wireshark/Config.in | 14 ++++++++++++++ .../wireshark/wireshark-dont-include-prefix.patch | 18 ++++++++++++++++++ package/wireshark/wireshark.mk | 10 ++++++++++ 4 files changed, 43 insertions(+) create mode 100644 package/wireshark/Config.in create mode 100644 package/wireshark/wireshark-dont-include-prefix.patch create mode 100644 package/wireshark/wireshark.mk diff --git a/package/Config.in b/package/Config.in index 1650c71..cd8d9ba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -646,6 +646,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/wget/Config.in" endif source "package/wireless_tools/Config.in" +source "package/wireshark/Config.in" source "package/wpa_supplicant/Config.in" source "package/xinetd/Config.in" source "package/xl2tp/Config.in" diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in new file mode 100644 index 0000000..e6d4e72 --- /dev/null +++ b/package/wireshark/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_WIRESHARK + bool "wireshark" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBGLIB2 + depends on BR2_USE_WCHAR # glib2 + help + Network traffic sniffer and protocol decoder. Currently only tshark, + the console interface, is enabled. + + http://www.wireshark.org + +comment "wireshark requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/wireshark/wireshark-dont-include-prefix.patch b/package/wireshark/wireshark-dont-include-prefix.patch new file mode 100644 index 0000000..6f3c946 --- /dev/null +++ b/package/wireshark/wireshark-dont-include-prefix.patch @@ -0,0 +1,18 @@ +configure.in: don't add the build host's /usr/include and /usr/lib to the +search path of include files and libraries. This is not what you want when +cross compiling. + +Signed-off-by: Baruch Siach +--- +diff -Nuar wireshark-1.8.3.orig/configure.in wireshark-1.8.3/configure.in +--- wireshark-1.8.3.orig/configure.in 2012-08-15 23:33:32.000000000 +0300 ++++ wireshark-1.8.3/configure.in 2012-10-24 09:54:15.259853331 +0200 +@@ -639,7 +639,7 @@ + # If using $prefix we add "$prefix/include" to the include search path + # and "$prefix/lib" to the library search path. + # +-if test "x$prefix" != "x" ; then ++if false ; then + AC_MSG_CHECKING(whether to use $prefix for headers and libraries) + if test -d $prefix/include ; then + AC_MSG_RESULT(yes) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk new file mode 100644 index 0000000..b50c223 --- /dev/null +++ b/package/wireshark/wireshark.mk @@ -0,0 +1,10 @@ +WIRESHARK_VERSION = 1.8.3 +WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 +WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions +WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2 +WIRESHARK_AUTORECONF = YES +WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config +WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \ + --enable-static=no + +$(eval $(call autotools-package))