diff options
| author |   Peter Volkov <pva@gentoo.org> | 2008-02-21 20:44:13 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2008-02-21 20:44:13 +0000 |
| commit | 646830b2bc2e94e19227f73cb9011fd14ac86b0d (patch) | |
| tree | c7898b6e3969f7ba9f514b908beda824bf143747 /net-analyzer | |
| parent | Stable for HPPA (bug #210517). (diff) | |
| download | gentoo-2-646830b2bc2e94e19227f73cb9011fd14ac86b0d.tar.gz gentoo-2-646830b2bc2e94e19227f73cb9011fd14ac86b0d.tar.bz2 gentoo-2-646830b2bc2e94e19227f73cb9011fd14ac86b0d.zip | |
Fixed regression: compilation failure with --as-needed, bug 210998, reported by Mike Auty and Hanno Böck.
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch | 11 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 0e624451c181..8c8eebb38057 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.78 2008/02/20 07:56:38 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.79 2008/02/21 20:44:13 pva Exp $ + + 21 Feb 2008; <pva@gentoo.org> +files/wireshark-0.99.8-as-needed.patch, + wireshark-0.99.8_rc1.ebuild: + Fixed regression: compilation failure with --as-needed, bug 210998, reported + by Mike Auty and Hanno Böck. *wireshark-0.99.8_rc1 (20 Feb 2008) diff --git a/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch b/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch new file mode 100644 index 000000000000..df495f8cf71b --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch @@ -0,0 +1,11 @@ +--- wiretap/Makefile.am.orig 2008-02-21 23:11:41.000000000 +0300 ++++ wiretap/Makefile.am 2008-02-21 23:12:08.000000000 +0300 +@@ -67,7 +67,7 @@ + $(GENERATOR_FILES) \ + $(GENERATED_FILES) + +-libwiretap_la_LIBADD = libwiretap_generated.la ++libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) + libwiretap_la_DEPENDENCIES = libwiretap_generated.la + + RUNLEX = $(top_srcdir)/tools/runlex.sh diff --git a/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild b/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild index a9f0722043e2..7cc61756a32b 100644 --- a/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild +++ b/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild,v 1.1 2008/02/20 07:56:38 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild,v 1.2 2008/02/21 20:44:13 pva Exp $ WANT_AUTOMAKE="1.9" inherit autotools libtool flag-o-matic eutils toolchain-funcs @@ -67,6 +67,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch + epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch cd "${S}"/epan epatch "${FILESDIR}"/wireshark-except-double-free.diff |