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 wireshark-1.6.13-ldflags.patch
Date: Wed, 30 Jan 2013 03:40:54
Message-Id: 20130130034050.A3A462171D@flycatcher.gentoo.org
1 jer 13/01/30 03:40:50
2
3 Modified: wireshark-1.8.1-ldflags.patch
4 Added: wireshark-1.6.13-ldflags.patch
5 Log:
6 Remove even more -L/usr/lib abuse.
7
8 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
9
10 Revision Changes Path
11 1.3 net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch?r1=1.2&r2=1.3
16
17 Index: wireshark-1.8.1-ldflags.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- wireshark-1.8.1-ldflags.patch 30 Jan 2013 01:56:23 -0000 1.2
24 +++ wireshark-1.8.1-ldflags.patch 30 Jan 2013 03:40:50 -0000 1.3
25 @@ -64,3 +64,72 @@
26 fi
27 ])
28 if test "x$want_geoip" = "xno"; then
29 +--- a/acinclude.m4
30 ++++ b/acinclude.m4
31 +@@ -435,7 +435,7 @@
32 + # searches the specified directory.
33 + #
34 + CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
35 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
36 ++dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
37 + fi
38 +
39 + # Pcap header check
40 +@@ -659,7 +659,7 @@
41 + wireshark_save_CPPFLAGS="$CPPFLAGS"
42 + CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
43 + wireshark_save_LIBS="$LIBS"
44 +- AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
45 ++dnl AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
46 + fi
47 +
48 + #
49 +@@ -711,7 +711,7 @@
50 + # of LIBS.
51 + #
52 + LIBS=""
53 +- AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
54 ++dnl AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
55 + LIBS="$LIBS -lz $wireshark_save_LIBS"
56 + else
57 + LIBS="-lz $LIBS"
58 +@@ -1162,7 +1162,8 @@
59 + if test "x$ac_cv_enable_usr_local" = "xyes" ; then
60 + withval=/usr/local
61 + if test -d "$withval"; then
62 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
63 ++dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
64 ++ true
65 + fi
66 + fi
67 + fi
68 +@@ -1193,7 +1194,8 @@
69 + if test "x$ac_cv_enable_usr_local" = "xyes" ; then
70 + withval=/usr/local
71 + if test -d "$withval"; then
72 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
73 ++dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
74 ++ true
75 + fi
76 + fi
77 + fi
78 +@@ -1224,7 +1226,8 @@
79 + if test "x$ac_cv_enable_usr_local" = "xyes" ; then
80 + withval=/usr/local
81 + if test -d "$withval"; then
82 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
83 ++dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
84 ++ true
85 + fi
86 + fi
87 + fi
88 +@@ -1508,7 +1511,8 @@
89 + if test "x$ac_cv_enable_usr_local" = "xyes" ; then
90 + withval=/usr/local
91 + if test -d "$withval"; then
92 +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
93 ++dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
94 ++ true
95 + fi
96 + fi
97 + fi
98
99
100
101 1.1 net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch
102
103 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch?rev=1.1&view=markup
104 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch?rev=1.1&content-type=text/plain
105
106 Index: wireshark-1.6.13-ldflags.patch
107 ===================================================================
108 --- a/acinclude.m4
109 +++ b/acinclude.m4
110 @@ -416,7 +416,7 @@
111 #
112 CFLAGS="$CFLAGS -I$pcap_dir/include"
113 CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
114 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
115 +dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
116 fi
117
118 # Pcap header check
119 @@ -642,7 +642,7 @@
120 wireshark_save_CPPFLAGS="$CPPFLAGS"
121 CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
122 wireshark_save_LIBS="$LIBS"
123 - AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
124 +dnl AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
125 fi
126
127 #
128 @@ -695,7 +695,7 @@
129 # LIBS.
130 #
131 LIBS=""
132 - AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
133 +dnl AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
134 LIBS="$LIBS -lz $wireshark_save_LIBS"
135 else
136 LIBS="-lz $LIBS"
137 @@ -1268,7 +1268,8 @@
138 if test "x$ac_cv_enable_usr_local" = "xyes" ; then
139 withval=/usr/local
140 if test -d "$withval"; then
141 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
142 +dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
143 + true
144 fi
145 fi
146 fi
147 @@ -1299,7 +1300,8 @@
148 if test "x$ac_cv_enable_usr_local" = "xyes" ; then
149 withval=/usr/local
150 if test -d "$withval"; then
151 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
152 +dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
153 + true
154 fi
155 fi
156 fi
157 @@ -1330,7 +1332,8 @@
158 if test "x$ac_cv_enable_usr_local" = "xyes" ; then
159 withval=/usr/local
160 if test -d "$withval"; then
161 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
162 +dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
163 + true
164 fi
165 fi
166 fi
167 @@ -1619,7 +1622,8 @@
168 if test "x$ac_cv_enable_usr_local" = "xyes" ; then
169 withval=/usr/local
170 if test -d "$withval"; then
171 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
172 +dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
173 + true
174 fi
175 fi
176 fi
177 --- a/configure.in
178 +++ b/configure.in
179 @@ -616,7 +616,8 @@
180 #
181 # Arrange that we search for libraries in "$prefix/lib".
182 #
183 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
184 +# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
185 + true
186 else
187 AC_MSG_RESULT(no)
188 fi
189 @@ -647,7 +648,8 @@
190 #
191 # Arrange that we search for libraries in "/usr/local/lib".
192 #
193 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
194 +# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
195 + true
196 else
197 AC_MSG_RESULT(no)
198 fi
199 @@ -1468,7 +1470,8 @@
200 want_libcap=yes
201 elif test -d "$withval"; then
202 want_libcap=yes
203 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
204 +# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
205 + true
206 fi
207 ])
208 if test "x$with_libcap" = "xno" ; then
209 @@ -1499,7 +1502,8 @@
210 want_ssl=yes
211 elif test -d "$withval"; then
212 want_ssl=yes
213 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
214 +# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
215 + true
216 fi
217 ],[
218 want_ssl=no
219 @@ -1564,7 +1568,8 @@
220 want_c_ares=yes
221 elif test -d "$withval"; then
222 want_c_ares=yes
223 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
224 +# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
225 + true
226 fi
227 ])
228 if test "x$want_c_ares" = "xno" ; then
229 @@ -1589,7 +1594,8 @@
230 want_adns=yes
231 elif test -d "$withval"; then
232 want_adns=yes
233 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
234 +# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
235 + true
236 fi
237 ])
238 if test "x$want_adns" = "xno" -o "x$have_good_c_ares" = "xyes" ; then
239 @@ -1614,7 +1620,8 @@
240 want_geoip=yes
241 elif test -d "$withval"; then
242 want_geoip=yes
243 - AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
244 +# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
245 + true
246 fi
247 ])
248 if test "x$want_geoip" = "xno"; then
Report Message
Find on MARC Find on Google Groups