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/ssldump/files: ssldump-0.9-configure-dylib.patch
Date: Thu, 26 Jun 2014 11:25:06
Message-Id: 20140626112457.D2F4F2004F@flycatcher.gentoo.org
1 jer 14/06/26 11:24:57
2
3 Modified: ssldump-0.9-configure-dylib.patch
4 Log:
5 Patch configure.in not configure. Use LIBS not LDFLAGS (bug #514056).
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.3 net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch?r1=1.2&r2=1.3
15
16 Index: ssldump-0.9-configure-dylib.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- ssldump-0.9-configure-dylib.patch 23 Jun 2014 20:06:35 -0000 1.2
23 +++ ssldump-0.9-configure-dylib.patch 26 Jun 2014 11:24:57 -0000 1.3
24 @@ -1,11 +1,28 @@
25 ---- a/configure
26 -+++ b/configure
27 -@@ -1103,7 +1103,7 @@
28 - echo "configure:1104: checking for PCAP library" >&5
29 +--- a/configure.in
30 ++++ b/configure.in
31 +@@ -102,14 +102,13 @@
32 + AC_MSG_CHECKING(for PCAP library)
33 ac_found_pcap_lib_dir="no"
34 for dir in $ac_pcap_lib_dir; do
35 - if test -f $dir/libpcap.a; then
36 -+ if test -f $dir/libpcap.a -o -f $dir/libpcap.dylib; then
37 - save_LIBS=$LIBS
38 - save_LDFLAGS=$LDFLAGS
39 ++ if test -f $dir/libpcap.so -o -f $dir/libpcap.dylib; then
40 + dnl Ok, we think we've found them, but check that they
41 +- dnl actually ontain the right functions
42 ++ dnl actually contain the right functions
43 + save_LIBS=$LIBS
44 +- save_LDFLAGS=$LDFLAGS
45 LIBS="-lpcap $LIBS"
46 + if test "$dir" != "/usr/lib"; then
47 +- LDFLAGS="-L$dir $LDFLAGS"
48 ++ LIBS="-L$dir $LIBS"
49 + fi
50 + AC_TRY_LINK_FUNC(pcap_open_live,ac_linked_libpcap="true",
51 + ac_linked_libpcap="false");
52 +@@ -118,7 +117,6 @@
53 + break
54 + fi
55 + LIBS=$save_LIBS
56 +- LDFLAGS=$save_LDFLAGS
57 + fi
58 + done
59 +