/[gentoo-x86]/net-misc/curl/files/curl-respect-cflags.patch
Gentoo

Contents of /net-misc/curl/files/curl-respect-cflags.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sat Feb 19 17:22:59 2011 UTC (3 years, 8 months ago) by scarabeus
Branch: MAIN
Revision bump to fix tftpd per bug #351478. Version bump to fix bug #343681 and bug #337506.

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

1 diff -urN curl-7.21.4.old/m4/curl-compilers.m4 curl-7.21.4/m4/curl-compilers.m4
2 --- curl-7.21.4.old/m4/curl-compilers.m4 2011-02-19 18:05:43.000000000 +0100
3 +++ curl-7.21.4/m4/curl-compilers.m4 2011-02-19 18:11:04.000000000 +0100
4 @@ -86,19 +86,19 @@
5 clangvhi=`echo $clangver | cut -d . -f1`
6 clangvlo=`echo $clangver | cut -d . -f2`
7 compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null`
8 - flags_dbg_all="-g -g0 -g1 -g2 -g3"
9 - flags_dbg_all="$flags_dbg_all -ggdb"
10 - flags_dbg_all="$flags_dbg_all -gstabs"
11 - flags_dbg_all="$flags_dbg_all -gstabs+"
12 - flags_dbg_all="$flags_dbg_all -gcoff"
13 - flags_dbg_all="$flags_dbg_all -gxcoff"
14 - flags_dbg_all="$flags_dbg_all -gdwarf-2"
15 - flags_dbg_all="$flags_dbg_all -gvms"
16 - flags_dbg_yes="-g"
17 - flags_dbg_off="-g0"
18 - flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
19 - flags_opt_yes="-Os"
20 - flags_opt_off="-O0"
21 + flags_dbg_all=""
22 + flags_dbg_all=""
23 + flags_dbg_all=""
24 + flags_dbg_all=""
25 + flags_dbg_all=""
26 + flags_dbg_all=""
27 + flags_dbg_all=""
28 + flags_dbg_all=""
29 + flags_dbg_yes=""
30 + flags_dbg_off=""
31 + flags_opt_all=""
32 + flags_opt_yes=""
33 + flags_opt_off=""
34 else
35 AC_MSG_RESULT([no])
36 fi
37 @@ -117,12 +117,12 @@
38 test "$curl_cv_have_def___DECC_VER" = "yes"; then
39 AC_MSG_RESULT([yes])
40 compiler_id="DEC_C"
41 - flags_dbg_all="-g -g0 -g1 -g2 -g3"
42 - flags_dbg_yes="-g2"
43 - flags_dbg_off="-g0"
44 - flags_opt_all="-O -O0 -O1 -O2 -O3 -O4"
45 - flags_opt_yes="-O1"
46 - flags_opt_off="-O0"
47 + flags_dbg_all=""
48 + flags_dbg_yes=""
49 + flags_dbg_off=""
50 + flags_opt_all=""
51 + flags_opt_yes=""
52 + flags_opt_off=""
53 else
54 AC_MSG_RESULT([no])
55 fi
56 @@ -146,19 +146,19 @@
57 gccvhi=`echo $gccver | cut -d . -f1`
58 gccvlo=`echo $gccver | cut -d . -f2`
59 compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
60 - flags_dbg_all="-g -g0 -g1 -g2 -g3"
61 - flags_dbg_all="$flags_dbg_all -ggdb"
62 - flags_dbg_all="$flags_dbg_all -gstabs"
63 - flags_dbg_all="$flags_dbg_all -gstabs+"
64 - flags_dbg_all="$flags_dbg_all -gcoff"
65 - flags_dbg_all="$flags_dbg_all -gxcoff"
66 - flags_dbg_all="$flags_dbg_all -gdwarf-2"
67 - flags_dbg_all="$flags_dbg_all -gvms"
68 - flags_dbg_yes="-g"
69 - flags_dbg_off="-g0"
70 - flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
71 - flags_opt_yes="-O2"
72 - flags_opt_off="-O0"
73 + flags_dbg_all=""
74 + flags_dbg_all=""
75 + flags_dbg_all=""
76 + flags_dbg_all=""
77 + flags_dbg_all=""
78 + flags_dbg_all=""
79 + flags_dbg_all=""
80 + flags_dbg_all=""
81 + flags_dbg_yes=""
82 + flags_dbg_off=""
83 + flags_opt_all=""
84 + flags_opt_yes=""
85 + flags_opt_off=""
86 else
87 AC_MSG_RESULT([no])
88 fi
89 @@ -175,12 +175,12 @@
90 if test "$curl_cv_have_def___HP_cc" = "yes"; then
91 AC_MSG_RESULT([yes])
92 compiler_id="HP_UX_C"
93 - flags_dbg_all="-g -s"
94 - flags_dbg_yes="-g"
95 - flags_dbg_off="-s"
96 - flags_opt_all="-O +O0 +O1 +O2 +O3 +O4"
97 - flags_opt_yes="+O2"
98 - flags_opt_off="+O0"
99 + flags_dbg_all=""
100 + flags_dbg_yes=""
101 + flags_dbg_off=""
102 + flags_opt_all=""
103 + flags_opt_yes=""
104 + flags_opt_off=""
105 else
106 AC_MSG_RESULT([no])
107 fi
108 @@ -197,19 +197,19 @@
109 if test "$curl_cv_have_def___IBMC__" = "yes"; then
110 AC_MSG_RESULT([yes])
111 compiler_id="IBM_C"
112 - flags_dbg_all="-g -g0 -g1 -g2 -g3"
113 - flags_dbg_yes="-g"
114 + flags_dbg_all=""
115 + flags_dbg_yes=""
116 flags_dbg_off=""
117 - flags_opt_all="-O -O0 -O1 -O2 -O3 -O4 -O5"
118 - flags_opt_all="$flags_opt_all -qnooptimize"
119 - flags_opt_all="$flags_opt_all -qoptimize=0"
120 - flags_opt_all="$flags_opt_all -qoptimize=1"
121 - flags_opt_all="$flags_opt_all -qoptimize=2"
122 - flags_opt_all="$flags_opt_all -qoptimize=3"
123 - flags_opt_all="$flags_opt_all -qoptimize=4"
124 - flags_opt_all="$flags_opt_all -qoptimize=5"
125 - flags_opt_yes="-O2"
126 - flags_opt_off="-qnooptimize"
127 + flags_opt_all=""
128 + flags_opt_all=""
129 + flags_opt_all=""
130 + flags_opt_all=""
131 + flags_opt_all=""
132 + flags_opt_all=""
133 + flags_opt_all=""
134 + flags_opt_all=""
135 + flags_opt_yes=""
136 + flags_opt_off=""
137 else
138 AC_MSG_RESULT([no])
139 fi
140 @@ -230,27 +230,27 @@
141 CURL_CHECK_DEF([__unix__], [], [silent])
142 if test "$curl_cv_have_def___unix__" = "yes"; then
143 compiler_id="INTEL_UNIX_C"
144 - flags_dbg_all="-g -g0"
145 - flags_dbg_yes="-g"
146 - flags_dbg_off="-g0"
147 - flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
148 - flags_opt_yes="-O2"
149 - flags_opt_off="-O0"
150 + flags_dbg_all=""
151 + flags_dbg_yes=""
152 + flags_dbg_off=""
153 + flags_opt_all=""
154 + flags_opt_yes=""
155 + flags_opt_off=""
156 else
157 compiler_id="INTEL_WINDOWS_C"
158 - flags_dbg_all="/ZI /Zi /zI /zi /ZD /Zd /zD /zd /Z7 /z7 /Oy /Oy-"
159 - flags_dbg_all="$flags_dbg_all /debug"
160 - flags_dbg_all="$flags_dbg_all /debug:none"
161 - flags_dbg_all="$flags_dbg_all /debug:minimal"
162 - flags_dbg_all="$flags_dbg_all /debug:partial"
163 - flags_dbg_all="$flags_dbg_all /debug:full"
164 - flags_dbg_all="$flags_dbg_all /debug:semantic_stepping"
165 - flags_dbg_all="$flags_dbg_all /debug:extended"
166 - flags_dbg_yes="/Zi /Oy-"
167 - flags_dbg_off="/debug:none /Oy-"
168 - flags_opt_all="/O /O0 /O1 /O2 /O3 /Od /Og /Og- /Oi /Oi-"
169 - flags_opt_yes="/O2"
170 - flags_opt_off="/Od"
171 + flags_dbg_all=""
172 + flags_dbg_all=""
173 + flags_dbg_all=""
174 + flags_dbg_all=""
175 + flags_dbg_all=""
176 + flags_dbg_all=""
177 + flags_dbg_all=""
178 + flags_dbg_all=""
179 + flags_dbg_yes=""
180 + flags_dbg_off=""
181 + flags_opt_all=""
182 + flags_opt_yes=""
183 + flags_opt_off=""
184 fi
185 else
186 AC_MSG_RESULT([no])
187 @@ -268,8 +268,8 @@
188 if test "$curl_cv_have_def___LCC__" = "yes"; then
189 AC_MSG_RESULT([yes])
190 compiler_id="LCC"
191 - flags_dbg_all="-g"
192 - flags_dbg_yes="-g"
193 + flags_dbg_all=""
194 + flags_dbg_yes=""
195 flags_dbg_off=""
196 flags_opt_all=""
197 flags_opt_yes=""
198 @@ -294,12 +294,12 @@
199 test "$compiler_id" = "unknown"; then
200 AC_MSG_RESULT([yes])
201 compiler_id="SGI_MIPS_C"
202 - flags_dbg_all="-g -g0 -g1 -g2 -g3"
203 - flags_dbg_yes="-g"
204 - flags_dbg_off="-g0"
205 - flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
206 - flags_opt_yes="-O2"
207 - flags_opt_off="-O0"
208 + flags_dbg_all=""
209 + flags_dbg_yes=""
210 + flags_dbg_off=""
211 + flags_opt_all=""
212 + flags_opt_yes=""
213 + flags_opt_off=""
214 else
215 AC_MSG_RESULT([no])
216 fi
217 @@ -321,12 +321,12 @@
218 test "$curl_cv_have_def__COMPILER_VERSION" = "yes"); then
219 AC_MSG_RESULT([yes])
220 compiler_id="SGI_MIPSPRO_C"
221 - flags_dbg_all="-g -g0 -g1 -g2 -g3"
222 - flags_dbg_yes="-g"
223 - flags_dbg_off="-g0"
224 - flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
225 - flags_opt_yes="-O2"
226 - flags_opt_off="-O0"
227 + flags_dbg_all=""
228 + flags_dbg_yes=""
229 + flags_dbg_off=""
230 + flags_opt_all=""
231 + flags_opt_yes=""
232 + flags_opt_off=""
233 else
234 AC_MSG_RESULT([no])
235 fi
236 @@ -343,11 +343,11 @@
237 if test "$curl_cv_have_def___SUNPRO_C" = "yes"; then
238 AC_MSG_RESULT([yes])
239 compiler_id="SUNPRO_C"
240 - flags_dbg_all="-g -s"
241 - flags_dbg_yes="-g"
242 - flags_dbg_off="-s"
243 - flags_opt_all="-O -xO -xO1 -xO2 -xO3 -xO4 -xO5"
244 - flags_opt_yes="-xO2"
245 + flags_dbg_all=""
246 + flags_dbg_yes=""
247 + flags_dbg_off=""
248 + flags_opt_all=""
249 + flags_opt_yes=""
250 flags_opt_off=""
251 else
252 AC_MSG_RESULT([no])
253 @@ -365,8 +365,8 @@
254 if test "$curl_cv_have_def___TINYC__" = "yes"; then
255 AC_MSG_RESULT([yes])
256 compiler_id="TINY_C"
257 - flags_dbg_all="-g -b"
258 - flags_dbg_yes="-g"
259 + flags_dbg_all=""
260 + flags_dbg_yes=""
261 flags_dbg_off=""
262 flags_opt_all=""
263 flags_opt_yes=""
264 @@ -389,12 +389,12 @@
265 CURL_CHECK_DEF([__UNIX__], [], [silent])
266 if test "$curl_cv_have_def___UNIX__" = "yes"; then
267 compiler_id="WATCOM_UNIX_C"
268 - flags_dbg_all="-g1 -g1+ -g2 -g3"
269 - flags_dbg_yes="-g2"
270 + flags_dbg_all=""
271 + flags_dbg_yes=""
272 flags_dbg_off=""
273 - flags_opt_all="-O0 -O1 -O2 -O3"
274 - flags_opt_yes="-O2"
275 - flags_opt_off="-O0"
276 + flags_opt_all=""
277 + flags_opt_yes=""
278 + flags_opt_off=""
279 else
280 compiler_id="WATCOM_WINDOWS_C"
281 flags_dbg_all=""

  ViewVC Help
Powered by ViewVC 1.1.20