[gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.11.0-oldlibs.patch

[gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.11.0-oldlibs.patch

[Jeroen Roovers (jer)]

jer         13/10/25 13:33:19

  Added:                wireshark-1.11.0-oldlibs.patch
  Log:
  Fix linking against installed libraries (bug #489104 by Kalin KOZHUHAROV).
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.1                  net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch?rev=1.1&view=markup
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

Index: wireshark-1.11.0-oldlibs.patch
===================================================================
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -137,6 +137,7 @@
 # Add the object files for missing routines, if any.
 #
 libwireshark_la_LIBADD = \
+	${top_builddir}/wiretap/libwiretap.la ${top_builddir}/wsutil/libwsutil.la \
 	libwireshark_generated.la \
 	libwireshark_asmopt.la crypt/libairpdcap.la \
 	ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
@@ -144,8 +145,7 @@
 	wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
 	@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
 	@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
-	${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
-	${top_builddir}/wsutil/libwsutil.la -lm
+	@GLIB_LIBS@ -lm
 
 libwireshark_la_DEPENDENCIES = \
 	libwireshark_generated.la \