Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.11.0-oldlibs.patch
Date: Fri, 25 Oct 2013 13:33:25
Message-Id: 20131025133319.108DD2004E@flycatcher.gentoo.org
1 jer 13/10/25 13:33:19
2
3 Added: wireshark-1.11.0-oldlibs.patch
4 Log:
5 Fix linking against installed libraries (bug #489104 by Kalin KOZHUHAROV).
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.1 net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch?rev=1.1&content-type=text/plain
14
15 Index: wireshark-1.11.0-oldlibs.patch
16 ===================================================================
17 --- a/epan/Makefile.am
18 +++ b/epan/Makefile.am
19 @@ -137,6 +137,7 @@
20 # Add the object files for missing routines, if any.
21 #
22 libwireshark_la_LIBADD = \
23 + ${top_builddir}/wiretap/libwiretap.la ${top_builddir}/wsutil/libwsutil.la \
24 libwireshark_generated.la \
25 libwireshark_asmopt.la crypt/libairpdcap.la \
26 ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
27 @@ -144,8 +145,7 @@
28 wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
29 @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
30 @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
31 - ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
32 - ${top_builddir}/wsutil/libwsutil.la -lm
33 + @GLIB_LIBS@ -lm
34
35 libwireshark_la_DEPENDENCIES = \
36 libwireshark_generated.la \