Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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.8.1-ldflags.patch
Date: Wed, 30 Jan 2013 04:18:58
Message-Id: 20130130041853.F07642171E@flycatcher.gentoo.org
1 jer 13/01/30 04:18:53
2
3 Modified: wireshark-1.8.1-ldflags.patch
4 Log:
5 Change file order in patch to match equivalent 1.6.13 patch.
6
7 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.4 net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch?r1=1.3&r2=1.4
15
16 Index: wireshark-1.8.1-ldflags.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- wireshark-1.8.1-ldflags.patch 30 Jan 2013 03:40:50 -0000 1.3
23 +++ wireshark-1.8.1-ldflags.patch 30 Jan 2013 04:18:53 -0000 1.4
24 @@ -1,69 +1,3 @@
25 ---- a/configure.in
26 -+++ b/configure.in
27 -@@ -652,7 +652,8 @@
28 - #
29 - # Arrange that we search for libraries in "$prefix/lib".
30 - #
31 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
32 -+# We do not need this - JeR (possibly bug #394479)
33 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
34 - else
35 - AC_MSG_RESULT(no)
36 - fi
37 -@@ -648,7 +648,7 @@
38 - #
39 - # Arrange that we search for libraries in "/usr/local/lib".
40 - #
41 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
42 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
43 - else
44 - AC_MSG_RESULT(no)
45 - fi
46 -@@ -1469,7 +1469,7 @@
47 - want_libcap=yes
48 - elif test -d "$withval"; then
49 - want_libcap=yes
50 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
51 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
52 - fi
53 - ])
54 - if test "x$with_libcap" = "xno" ; then
55 -@@ -1500,7 +1500,7 @@
56 - want_ssl=yes
57 - elif test -d "$withval"; then
58 - want_ssl=yes
59 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
60 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
61 - fi
62 - ],[
63 - want_ssl=no
64 -@@ -1565,7 +1565,7 @@
65 - want_c_ares=yes
66 - elif test -d "$withval"; then
67 - want_c_ares=yes
68 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
69 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
70 - fi
71 - ])
72 - if test "x$want_c_ares" = "xno" ; then
73 -@@ -1590,7 +1590,7 @@
74 - want_adns=yes
75 - elif test -d "$withval"; then
76 - want_adns=yes
77 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
78 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
79 - fi
80 - ])
81 - if test "x$want_adns" = "xno" -o "x$have_good_c_ares" = "xyes" ; then
82 -@@ -1615,7 +1615,7 @@
83 - want_geoip=yes
84 - elif test -d "$withval"; then
85 - want_geoip=yes
86 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
87 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
88 - fi
89 - ])
90 - if test "x$want_geoip" = "xno"; then
91 --- a/acinclude.m4
92 +++ b/acinclude.m4
93 @@ -435,7 +435,7 @@
94 @@ -133,3 +67,70 @@
95 fi
96 fi
97 fi
98 +--- a/configure.in
99 ++++ b/configure.in
100 +@@ -652,7 +652,8 @@
101 + #
102 + # Arrange that we search for libraries in "$prefix/lib".
103 + #
104 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
105 ++# We do not need this - JeR (possibly bug #394479)
106 ++# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
107 + else
108 + AC_MSG_RESULT(no)
109 + fi
110 +@@ -648,7 +648,7 @@
111 + #
112 + # Arrange that we search for libraries in "/usr/local/lib".
113 + #
114 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
115 ++# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
116 + else
117 + AC_MSG_RESULT(no)
118 + fi
119 +@@ -1469,7 +1469,7 @@
120 + want_libcap=yes
121 + elif test -d "$withval"; then
122 + want_libcap=yes
123 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
124 ++# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
125 + fi
126 + ])
127 + if test "x$with_libcap" = "xno" ; then
128 +@@ -1500,7 +1500,7 @@
129 + want_ssl=yes
130 + elif test -d "$withval"; then
131 + want_ssl=yes
132 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
133 ++# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
134 + fi
135 + ],[
136 + want_ssl=no
137 +@@ -1565,7 +1565,7 @@
138 + want_c_ares=yes
139 + elif test -d "$withval"; then
140 + want_c_ares=yes
141 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
142 ++# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
143 + fi
144 + ])
145 + if test "x$want_c_ares" = "xno" ; then
146 +@@ -1590,7 +1590,7 @@
147 + want_adns=yes
148 + elif test -d "$withval"; then
149 + want_adns=yes
150 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
151 ++# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
152 + fi
153 + ])
154 + if test "x$want_adns" = "xno" -o "x$have_good_c_ares" = "xyes" ; then
155 +@@ -1615,7 +1615,7 @@
156 + want_geoip=yes
157 + elif test -d "$withval"; then
158 + want_geoip=yes
159 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
160 ++# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
161 + fi
162 + ])
163 + if test "x$want_geoip" = "xno"; then
164 +
Report Message
Find on MARC Find on Google Groups