All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] wireshark: new package
@ 2012-10-22  6:27 Baruch Siach
  2012-10-23 17:05 ` Arnout Vandecappelle
  0 siblings, 1 reply; 8+ messages in thread
From: Baruch Siach @ 2012-10-22  6:27 UTC (permalink / raw)
  To: buildroot

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.
---
I override the $prefix configure variable because otherwise the host
/usr/include is added to the -I and -L paths. I'm not sure this is a good idea
though, since it clutters the tshark RPATH with directories from the local
build paths. If you have a better I'd be glad to hear.

 package/Config.in              |    1 +
 package/wireshark/Config.in    |   14 ++++++++++++++
 package/wireshark/wireshark.mk |   10 ++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/wireshark/Config.in
 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.mk b/package/wireshark/wireshark.mk
new file mode 100644
index 0000000..c89fbf8
--- /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_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \
+		     prefix=$(STAGING_DIR)/usr --with-sysroot=$(STAGING_DIR) \
+		     --enable-static=no
+
+$(eval $(call autotools-package))
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] wireshark: new package
  2012-10-22  6:27 [Buildroot] [PATCH] wireshark: new package Baruch Siach
@ 2012-10-23 17:05 ` Arnout Vandecappelle
  2012-10-24  7:31   ` Baruch Siach
  0 siblings, 1 reply; 8+ messages in thread
From: Arnout Vandecappelle @ 2012-10-23 17:05 UTC (permalink / raw)
  To: buildroot

On 22/10/12 08:27, Baruch Siach wrote:
> 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.
> ---
> I override the $prefix configure variable because otherwise the host
> /usr/include is added to the -I and -L paths. I'm not sure this is a good idea
> though, since it clutters the tshark RPATH with directories from the local
> build paths. If you have a better I'd be glad to hear.

  That usually means there's a broken Makefile.am and we fix it with a patch.
However, does installation still work with the prefix override?

[snip]
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> new file mode 100644
> index 0000000..c89fbf8
> --- /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_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
> +WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \
> +		     prefix=$(STAGING_DIR)/usr --with-sysroot=$(STAGING_DIR) \

  Why is the --with-sysroot needed?

> +		     --enable-static=no

  We normally build both dynamic and static libraries, and remove the static
library in the target.  Doesn't that work in wireshark?  Can you add a comment
to explain that?


  Regards,
  Arnout

-- 
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] wireshark: new package
  2012-10-23 17:05 ` Arnout Vandecappelle
@ 2012-10-24  7:31   ` Baruch Siach
  2012-10-24  7:49     ` Arnout Vandecappelle
  0 siblings, 1 reply; 8+ messages in thread
From: Baruch Siach @ 2012-10-24  7:31 UTC (permalink / raw)
  To: buildroot

Hi Anout,

Thanks for reviewing.

On Tue, Oct 23, 2012 at 07:05:39PM +0200, Arnout Vandecappelle wrote:
> On 22/10/12 08:27, Baruch Siach wrote:
> >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.
> >---
> >I override the $prefix configure variable because otherwise the host
> >/usr/include is added to the -I and -L paths. I'm not sure this is a good idea
> >though, since it clutters the tshark RPATH with directories from the local
> >build paths. If you have a better I'd be glad to hear.
> 
>  That usually means there's a broken Makefile.am and we fix it with a patch.
> However, does installation still work with the prefix override?

Yes. However I see $prefix added to the tshark binary RPATH, which is not 
nice. I'll try patching configure.in.

> [snip]
> >diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> >new file mode 100644
> >index 0000000..c89fbf8
> >--- /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_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
> >+WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \
> >+		     prefix=$(STAGING_DIR)/usr --with-sysroot=$(STAGING_DIR) \
> 
>  Why is the --with-sysroot needed?

Removing --with-sysroot doesn't negatively affect build or run of tshark. I 
get the following line during configure, however:

checking for sysroot... no

Is it significant?

> >+		     --enable-static=no
> 
>  We normally build both dynamic and static libraries, and remove the static
> library in the target.  Doesn't that work in wireshark?  Can you add a comment
> to explain that?

Without --enable-static=no build fails with:

ld: tshark: hidden symbol `__GI_atan' isn't defined

My toolchain is external:

powerpc-linux-gnu-gcc (Sourcery G++ Lite 2011.03-38) 4.5.2

Any ideas?

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] wireshark: new package
  2012-10-24  7:31   ` Baruch Siach
@ 2012-10-24  7:49     ` Arnout Vandecappelle
  0 siblings, 0 replies; 8+ messages in thread
From: Arnout Vandecappelle @ 2012-10-24  7:49 UTC (permalink / raw)
  To: buildroot

On 24/10/12 09:31, Baruch Siach wrote:
[snip]
>>> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
>>> new file mode 100644
>>> index 0000000..c89fbf8
>>> --- /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_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
>>> +WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \
>>> +		     prefix=$(STAGING_DIR)/usr --with-sysroot=$(STAGING_DIR) \
>>
>>   Why is the --with-sysroot needed?
>
> Removing --with-sysroot doesn't negatively affect build or run of tshark. I
> get the following line during configure, however:
>
> checking for sysroot... no
>
> Is it significant?

  You'll see that for most autoconf packages.

>>> +		     --enable-static=no
>>
>>   We normally build both dynamic and static libraries, and remove the static
>> library in the target.  Doesn't that work in wireshark?  Can you add a comment
>> to explain that?
>
> Without --enable-static=no build fails with:
>
> ld: tshark: hidden symbol `__GI_atan' isn't defined
>
> My toolchain is external:
>
> powerpc-linux-gnu-gcc (Sourcery G++ Lite 2011.03-38) 4.5.2
>
> Any ideas?

  Nothing right away, except maybe a missing -lm but then I don't see why it
doesn't fail in the non-static case.  But we probably don't want the static
build of tshark anyway, so just keep the --enable-static=no and add comment
explaining why it doesn't work without it.

  Regards,
  Arnout
-- 
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] wireshark: new package
  2013-01-30 11:47 ` Gustavo Zacarias
@ 2013-01-30 12:20   ` Baruch Siach
  0 siblings, 0 replies; 8+ messages in thread
From: Baruch Siach @ 2013-01-30 12:20 UTC (permalink / raw)
  To: buildroot

Hi Gustavo,

On Wed, Jan 30, 2013 at 08:47:19AM -0300, Gustavo Zacarias wrote:
> On 01/30/2013 02:42 AM, Baruch Siach wrote:
> > +WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
> 
> I need ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config in
> CONF_ENV also. That's because configure is finding /usr/bin/pcap-config
> from my distribution before the staging one.
> And also the exec_prefix/prefix fixups in
> $(STAGING_DIR)/usr/bin/pcap-config since they point to /usr (the usual
> way in libpcap or Stefan's patch for the nice fixup).
> With these tweaks it builds nicely.
> Also might be worth to bump (again!) to 1.8.5 a security release.

Thanks for testing. I'll updated the patch an resend.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] wireshark: new package
  2013-01-30  5:42 Baruch Siach
@ 2013-01-30 11:47 ` Gustavo Zacarias
  2013-01-30 12:20   ` Baruch Siach
  0 siblings, 1 reply; 8+ messages in thread
From: Gustavo Zacarias @ 2013-01-30 11:47 UTC (permalink / raw)
  To: buildroot

On 01/30/2013 02:42 AM, Baruch Siach wrote:
> +WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config

I need ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config in
CONF_ENV also. That's because configure is finding /usr/bin/pcap-config
from my distribution before the staging one.
And also the exec_prefix/prefix fixups in
$(STAGING_DIR)/usr/bin/pcap-config since they point to /usr (the usual
way in libpcap or Stefan's patch for the nice fixup).
With these tweaks it builds nicely.
Also might be worth to bump (again!) to 1.8.5 a security release.
Regards.

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] wireshark: new package
@ 2013-01-30  5:42 Baruch Siach
  2013-01-30 11:47 ` Gustavo Zacarias
  0 siblings, 1 reply; 8+ messages in thread
From: Baruch Siach @ 2013-01-30  5:42 UTC (permalink / raw)
  To: buildroot

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.

Cc: Stefan Fr?berg <stefan.froberg@petroprogram.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
The "big" wireshark build of Stefan Fr?berg isn't here yet, so please consider
applying this minimal wireshark as a starting point.

tshark still contains build directories in its RPATH, but as Thomas has
indicated (http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/52377),
this should not be a show-stopper.

Changes v3 -> v4:
	* Update to version 1.8.4

Changes v2 -> v3:
	* Use an upstreamable patch as suggested by Thomas Petazzoni
	* Add license info

Changes v1 -> v2:
	* Patch configure.in and enable autoreconf, instead of overriding
	  $prefix
	* Remove --with-sysroot as suggested by Arnout Vandecappelle

 package/Config.in                                  |    1 +
 package/wireshark/Config.in                        |   14 +++++++
 .../wireshark/wireshark-dont-include-prefix.patch  |   41 ++++++++++++++++++++
 package/wireshark/wireshark.mk                     |   18 +++++++++
 4 files changed, 74 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 ebd9817..63ab1f3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -727,6 +727,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..567af9a
--- /dev/null
+++ b/package/wireshark/wireshark-dont-include-prefix.patch
@@ -0,0 +1,41 @@
+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.
+
+Sent upstream as https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7926.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+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-28 10:07:54.864388531 +0200
+@@ -635,29 +635,6 @@
+ AC_SUBST(CORESERVICES_FRAMEWORKS)
+ AC_SUBST(LAUNCHSERVICES_FRAMEWORKS)
+ 
+-#
+-# 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
+-	AC_MSG_CHECKING(whether to use $prefix for headers and libraries)
+-	if test -d $prefix/include ; then
+-		AC_MSG_RESULT(yes)
+-		#
+-		# Arrange that we search for header files in "$prefix/include", as
+-		# various packages we use may have been installed under "$prefix/include".
+-		#
+-		CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-
+-		#
+-		# Arrange that we search for libraries in "$prefix/lib".
+-		#
+-		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
+-	else
+-		AC_MSG_RESULT(no)
+-	fi
+-fi
+-
+ dnl Look in /usr/local for header files and libraries ?
+ dnl XXX FIXME don't include /usr/local if it is already in the system
+ dnl search path as this causes gcc 3.2 on Linux to complain about a change
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
new file mode 100644
index 0000000..c2efc2c
--- /dev/null
+++ b/package/wireshark/wireshark.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# wireshark
+#
+#############################################################
+
+WIRESHARK_VERSION = 1.8.4
+WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
+WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
+WIRESHARK_LICENSE = wireshark license
+WIRESHARK_LICENSE_FILES = COPYING
+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))
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] wireshark: new package
@ 2012-10-28  8:53 Baruch Siach
  0 siblings, 0 replies; 8+ messages in thread
From: Baruch Siach @ 2012-10-28  8:53 UTC (permalink / raw)
  To: buildroot

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 <baruch@tkos.co.il>
---
Changes v2 -> v3:
	* Use an upstreamable patch as suggested by Thomas Petazzoni
	* Add license info

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  |   41 ++++++++++++++++++++
 package/wireshark/wireshark.mk                     |   12 ++++++
 4 files changed, 68 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..567af9a
--- /dev/null
+++ b/package/wireshark/wireshark-dont-include-prefix.patch
@@ -0,0 +1,41 @@
+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.
+
+Sent upstream as https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7926.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+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-28 10:07:54.864388531 +0200
+@@ -635,29 +635,6 @@
+ AC_SUBST(CORESERVICES_FRAMEWORKS)
+ AC_SUBST(LAUNCHSERVICES_FRAMEWORKS)
+ 
+-#
+-# 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
+-	AC_MSG_CHECKING(whether to use $prefix for headers and libraries)
+-	if test -d $prefix/include ; then
+-		AC_MSG_RESULT(yes)
+-		#
+-		# Arrange that we search for header files in "$prefix/include", as
+-		# various packages we use may have been installed under "$prefix/include".
+-		#
+-		CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-
+-		#
+-		# Arrange that we search for libraries in "$prefix/lib".
+-		#
+-		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
+-	else
+-		AC_MSG_RESULT(no)
+-	fi
+-fi
+-
+ dnl Look in /usr/local for header files and libraries ?
+ dnl XXX FIXME don't include /usr/local if it is already in the system
+ dnl search path as this causes gcc 3.2 on Linux to complain about a change
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
new file mode 100644
index 0000000..99f90af
--- /dev/null
+++ b/package/wireshark/wireshark.mk
@@ -0,0 +1,12 @@
+WIRESHARK_VERSION = 1.8.3
+WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
+WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
+WIRESHARK_LICENSE = wireshark license
+WIRESHARK_LICENSE_FILES = COPYING
+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))
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-01-30 12:20 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-22  6:27 [Buildroot] [PATCH] wireshark: new package Baruch Siach
2012-10-23 17:05 ` Arnout Vandecappelle
2012-10-24  7:31   ` Baruch Siach
2012-10-24  7:49     ` Arnout Vandecappelle
2012-10-28  8:53 Baruch Siach
2013-01-30  5:42 Baruch Siach
2013-01-30 11:47 ` Gustavo Zacarias
2013-01-30 12:20   ` Baruch Siach

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.