1 |
dev-zero 10/08/21 09:54:44 |
2 |
|
3 |
Added: 01_all_5.2.1-opts.diff |
4 |
04_all_5.2.1-debian-hppa.diff |
5 |
05_all_5.2.1-debian-fix-warnings.diff |
6 |
06_all_5.2.1-debian-destdir.diff |
7 |
08_all_5.2.1-debian-alpha-build.diff |
8 |
09_all_5.2.1-debian-arm-build-7820fe.diff |
9 |
10_all_5.2.1-debian-less-warnings-485555.diff |
10 |
11_all_5.2.1-quote_cxx_version.diff |
11 |
12_all_5.2.1-overwrite_all_libdir.diff |
12 |
Log: |
13 |
Added patchset for STLport-5.2.1 |
14 |
|
15 |
Revision Changes Path |
16 |
1.1 src/patchsets/STLport/5.2.1/patches/01_all_5.2.1-opts.diff |
17 |
|
18 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/01_all_5.2.1-opts.diff?rev=1.1&view=markup |
19 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/01_all_5.2.1-opts.diff?rev=1.1&content-type=text/plain |
20 |
|
21 |
Index: 01_all_5.2.1-opts.diff |
22 |
=================================================================== |
23 |
Index: stlport5.2-5.2.1/build/Makefiles/gmake/gcc.mak |
24 |
=================================================================== |
25 |
--- stlport5.2-5.2.1.orig/build/Makefiles/gmake/gcc.mak 2008-12-10 10:56:51.000000000 +0100 |
26 |
+++ stlport5.2-5.2.1/build/Makefiles/gmake/gcc.mak 2009-01-11 12:03:07.000000000 +0100 |
27 |
@@ -246,7 +246,7 @@ |
28 |
|
29 |
# optimization and debug compiler flags |
30 |
release-static : OPT += -O2 |
31 |
-release-shared : OPT += -O2 |
32 |
+release-shared : OPT += |
33 |
|
34 |
dbg-static : OPT += -g |
35 |
dbg-shared : OPT += -g |
36 |
|
37 |
|
38 |
|
39 |
1.1 src/patchsets/STLport/5.2.1/patches/04_all_5.2.1-debian-hppa.diff |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/04_all_5.2.1-debian-hppa.diff?rev=1.1&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/04_all_5.2.1-debian-hppa.diff?rev=1.1&content-type=text/plain |
43 |
|
44 |
Index: 04_all_5.2.1-debian-hppa.diff |
45 |
=================================================================== |
46 |
Index: stlport5.2-5.2.1/build/Makefiles/gmake/lib/gcc.mak |
47 |
=================================================================== |
48 |
--- stlport5.2-5.2.1.orig/build/Makefiles/gmake/lib/gcc.mak 2009-01-11 12:17:25.000000000 +0100 |
49 |
+++ stlport5.2-5.2.1/build/Makefiles/gmake/lib/gcc.mak 2009-01-11 12:23:04.000000000 +0100 |
50 |
@@ -158,6 +158,9 @@ |
51 |
END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
52 |
STDLIBS = -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm |
53 |
endif |
54 |
+ifneq (,$(findstring $(M_ARCH),hppa parisc64 parisc)) |
55 |
+STDLIBS += -lgcc |
56 |
+endif |
57 |
ifeq ($(OSNAME),openbsd) |
58 |
START_OBJ := $(shell for o in crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
59 |
END_OBJ := $(shell for o in crtendS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
60 |
Index: stlport5.2-5.2.1/build/Makefiles/gmake/app/gcc.mak |
61 |
=================================================================== |
62 |
--- stlport5.2-5.2.1.orig/build/Makefiles/gmake/app/gcc.mak 2009-01-11 12:17:25.000000000 +0100 |
63 |
+++ stlport5.2-5.2.1/build/Makefiles/gmake/app/gcc.mak 2009-01-11 12:21:04.000000000 +0100 |
64 |
@@ -140,6 +140,9 @@ |
65 |
START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
66 |
END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
67 |
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm |
68 |
+ifneq (,$(findstring $(M_ARCH),hppa parisc64 parisc)) |
69 |
+STDLIBS += -lgcc |
70 |
+endif |
71 |
endif |
72 |
|
73 |
ifeq ($(OSNAME),openbsd) |
74 |
|
75 |
|
76 |
|
77 |
1.1 src/patchsets/STLport/5.2.1/patches/05_all_5.2.1-debian-fix-warnings.diff |
78 |
|
79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/05_all_5.2.1-debian-fix-warnings.diff?rev=1.1&view=markup |
80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/05_all_5.2.1-debian-fix-warnings.diff?rev=1.1&content-type=text/plain |
81 |
|
82 |
Index: 05_all_5.2.1-debian-fix-warnings.diff |
83 |
=================================================================== |
84 |
Do we still need this patch? 2009-01-11, Torsten Werner |
85 |
|
86 |
Index: stlport5.2-5.2.1/stlport/stl/debug/_debug.h |
87 |
=================================================================== |
88 |
--- stlport5.2-5.2.1.orig/stlport/stl/debug/_debug.h 2008-12-10 10:56:51.000000000 +0100 |
89 |
+++ stlport5.2-5.2.1/stlport/stl/debug/_debug.h 2009-01-11 12:25:26.000000000 +0100 |
90 |
@@ -176,6 +176,7 @@ |
91 |
} |
92 |
# endif |
93 |
|
94 |
+# define _STLP_VERBOSE_PARAM(param) param |
95 |
# define _STLP_DEBUG_CHECK(expr) _STLP_ASSERT(expr) |
96 |
|
97 |
# if (_STLP_DEBUG_LEVEL == _STLP_STANDARD_DBG_LEVEL) |
98 |
|
99 |
|
100 |
|
101 |
1.1 src/patchsets/STLport/5.2.1/patches/06_all_5.2.1-debian-destdir.diff |
102 |
|
103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/06_all_5.2.1-debian-destdir.diff?rev=1.1&view=markup |
104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/06_all_5.2.1-debian-destdir.diff?rev=1.1&content-type=text/plain |
105 |
|
106 |
Index: 06_all_5.2.1-debian-destdir.diff |
107 |
=================================================================== |
108 |
- fix INSTALL_HDR_DIR |
109 |
- do not repeat DESTDIR in BASE_INSTALL_DIR |
110 |
|
111 |
Index: stlport5.2-5.2.1/build/Makefiles/gmake/targetdirs.mak |
112 |
=================================================================== |
113 |
--- stlport5.2-5.2.1.orig/build/Makefiles/gmake/targetdirs.mak 2008-12-10 10:56:51.000000000 +0100 |
114 |
+++ stlport5.2-5.2.1/build/Makefiles/gmake/targetdirs.mak 2009-01-11 13:10:32.000000000 +0100 |
115 |
@@ -52,7 +52,7 @@ |
116 |
ifndef WITHOUT_STLPORT |
117 |
INSTALL_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR}_stlg |
118 |
endif |
119 |
-INSTALL_HDR_DIR ?= ${BASE_INSTALL_DIR}/include |
120 |
+INSTALL_HDR_DIR ?= ${BASE_INSTALL_HDR_DIR}/include |
121 |
|
122 |
ifndef WITHOUT_STLPORT |
123 |
OUTPUT_DIRS := $(OUTPUT_DIR) $(OUTPUT_DIR_DBG) $(OUTPUT_DIR_STLDBG) \ |
124 |
Index: stlport5.2-5.2.1/configure |
125 |
=================================================================== |
126 |
--- stlport5.2-5.2.1.orig/configure 2009-01-11 13:10:36.000000000 +0100 |
127 |
+++ stlport5.2-5.2.1/configure 2009-01-11 13:10:43.000000000 +0100 |
128 |
@@ -247,7 +247,7 @@ |
129 |
compiler_family_set=y |
130 |
;; |
131 |
--prefix=*) |
132 |
- write_option "$option" BASE_INSTALL_DIR '${DESTDIR}' |
133 |
+ write_option "$option" BASE_INSTALL_DIR |
134 |
prefix_set=y |
135 |
;; |
136 |
--bindir=*) |
137 |
|
138 |
|
139 |
|
140 |
1.1 src/patchsets/STLport/5.2.1/patches/08_all_5.2.1-debian-alpha-build.diff |
141 |
|
142 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/08_all_5.2.1-debian-alpha-build.diff?rev=1.1&view=markup |
143 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/08_all_5.2.1-debian-alpha-build.diff?rev=1.1&content-type=text/plain |
144 |
|
145 |
Index: 08_all_5.2.1-debian-alpha-build.diff |
146 |
=================================================================== |
147 |
Index: stlport5.2-5.2.1/stlport/stl/_cwchar.h |
148 |
=================================================================== |
149 |
--- stlport5.2-5.2.1.orig/stlport/stl/_cwchar.h 2009-06-28 15:23:52.000000000 +0200 |
150 |
+++ stlport5.2-5.2.1/stlport/stl/_cwchar.h 2009-06-28 15:24:12.000000000 +0200 |
151 |
@@ -131,22 +131,6 @@ |
152 |
# undef WCHAR_MAX |
153 |
# define WCHAR_MAX 0xffff |
154 |
# endif |
155 |
-# if defined (__GNUC__) && defined (__alpha__) |
156 |
-/* Definition of WCHAR_MIN and MAX are wrong for alpha platform |
157 |
- * as gcc consider wchar_t as an unsigned type but WCHAR_MIN is defined as |
158 |
- * a negative value. Static assertion is here to check that a future alpha |
159 |
- * SDK or a future gcc won't change the situation making this workaround |
160 |
- * useless. |
161 |
- */ |
162 |
-/* Check that gcc still consider wchar_t as unsigned */ |
163 |
-_STLP_STATIC_ASSERT(((wchar_t)-1 > 0)) |
164 |
-/* Check that WCHAR_MIN value hasn't been fixed */ |
165 |
-_STLP_STATIC_ASSERT((WCHAR_MIN < 0)) |
166 |
-# undef WCHAR_MIN |
167 |
-# define WCHAR_MIN 0 |
168 |
-# undef WCHAR_MAX |
169 |
-# define WCHAR_MAX 0xffffffff |
170 |
-# endif |
171 |
# if defined(__HP_aCC) && (__HP_aCC >= 60000) |
172 |
/* Starting with B.11.31, HP-UX/ia64 provides C99-compliant definitions |
173 |
* of WCHAR_MIN/MAX macros without having to define |
174 |
|
175 |
|
176 |
|
177 |
1.1 src/patchsets/STLport/5.2.1/patches/09_all_5.2.1-debian-arm-build-7820fe.diff |
178 |
|
179 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/09_all_5.2.1-debian-arm-build-7820fe.diff?rev=1.1&view=markup |
180 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/09_all_5.2.1-debian-arm-build-7820fe.diff?rev=1.1&content-type=text/plain |
181 |
|
182 |
Index: 09_all_5.2.1-debian-arm-build-7820fe.diff |
183 |
=================================================================== |
184 |
From: Petr Ovtchenkov <ptr@××××××××.info> |
185 |
Date: Thu, 25 Jun 2009 08:06:11 +0000 (+0400) |
186 |
Subject: Fix build for ARM GNU/Linux |
187 |
X-Git-Url: http://stlport.git.sourceforge.net/git/gitweb.cgi?p=stlport;a=commitdiff_plain;h=7820fe8e502b062f82d8bb630ad07aa20f6d2d4c |
188 |
|
189 |
Fix build for ARM GNU/Linux |
190 |
|
191 |
llabs, lldiv_t, lldiv not defined in native gcc's std namespace; |
192 |
use ones from C space (i.e. from global namespace) instead. |
193 |
|
194 |
Build done for Sourcery G++ Lite 2009q1-176 for ARM GNU/Linux; |
195 |
unit test build success, run not checked. |
196 |
--- |
197 |
|
198 |
Index: stlport5.2-5.2.1/stlport/stl/_cstdlib.h |
199 |
=================================================================== |
200 |
--- stlport5.2-5.2.1.orig/stlport/stl/_cstdlib.h 2008-12-10 10:56:51.000000000 +0100 |
201 |
+++ stlport5.2-5.2.1/stlport/stl/_cstdlib.h 2009-06-28 15:22:50.000000000 +0200 |
202 |
@@ -91,7 +91,7 @@ |
203 |
using _STLP_VENDOR_CSTD::labs; |
204 |
using _STLP_VENDOR_CSTD::ldiv; |
205 |
# if defined (_STLP_LONG_LONG) && !defined (_STLP_NO_VENDOR_STDLIB_L) |
206 |
-# if !defined(__sun) |
207 |
+# if !defined(__sun) && !defined(__arm__) |
208 |
using _STLP_VENDOR_CSTD::llabs; |
209 |
using _STLP_VENDOR_CSTD::lldiv_t; |
210 |
using _STLP_VENDOR_CSTD::lldiv; |
211 |
@@ -147,7 +147,7 @@ |
212 |
|
213 |
#if defined (_STLP_LONG_LONG) |
214 |
# if !defined (_STLP_NO_VENDOR_STDLIB_L) |
215 |
-# if !defined (__sun) |
216 |
+# if !defined (__sun) && !defined(__arm__) && !defined(__mips__) && !defined(__mipsel__) |
217 |
inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return _STLP_VENDOR_CSTD::llabs(__x); } |
218 |
inline lldiv_t div(_STLP_LONG_LONG __x, _STLP_LONG_LONG __y) { return _STLP_VENDOR_CSTD::lldiv(__x, __y); } |
219 |
# else |
220 |
|
221 |
|
222 |
|
223 |
1.1 src/patchsets/STLport/5.2.1/patches/10_all_5.2.1-debian-less-warnings-485555.diff |
224 |
|
225 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/10_all_5.2.1-debian-less-warnings-485555.diff?rev=1.1&view=markup |
226 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/10_all_5.2.1-debian-less-warnings-485555.diff?rev=1.1&content-type=text/plain |
227 |
|
228 |
Index: 10_all_5.2.1-debian-less-warnings-485555.diff |
229 |
=================================================================== |
230 |
Index: stlport5.2-5.2.1/stlport/stl/_algobase.c |
231 |
=================================================================== |
232 |
--- stlport5.2-5.2.1.orig/stlport/stl/_algobase.c 2008-12-10 10:56:51.000000000 +0100 |
233 |
+++ stlport5.2-5.2.1/stlport/stl/_algobase.c 2009-06-29 19:30:21.000000000 +0200 |
234 |
@@ -326,7 +326,7 @@ |
235 |
template <class _InputIter, class _ForwardIter, class _Tp1, class _Tp2> |
236 |
inline _InputIter __find_first_of_aux1(_InputIter __first1, _InputIter __last1, |
237 |
_ForwardIter __first2, _ForwardIter __last2, |
238 |
- _Tp1* __pt1, _Tp2* __pt2) { |
239 |
+ _Tp1*, _Tp2* __pt2) { |
240 |
typedef _STLP_TYPENAME _STLP_STD::_IsIntegral<_Tp1>::_Ret _IsIntegral; |
241 |
typedef _STLP_TYPENAME _STLP_PRIV _IsCharLikeType<_Tp2>::_Ret _IsCharLike; |
242 |
typedef _STLP_TYPENAME _STLP_STD::_Land2<_IsIntegral, _IsCharLike>::_Ret _UseStrcspnLikeAlgo; |
243 |
@@ -451,7 +451,7 @@ |
244 |
|
245 |
template <class _ForwardIter, class _Tp, class _Compare1, class _Compare2, class _Distance> |
246 |
_ForwardIter __lower_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val, |
247 |
- _Compare1 __comp1, _Compare2 __comp2, _Distance*) { |
248 |
+ _Compare1 __comp1, _Compare2 _STLP_VERBOSE_PARAM(__comp2), _Distance*) { |
249 |
_Distance __len = _STLP_STD::distance(__first, __last); |
250 |
_Distance __half; |
251 |
_ForwardIter __middle; |
252 |
Index: stlport5.2-5.2.1/stlport/stl/_hashtable.c |
253 |
=================================================================== |
254 |
--- stlport5.2-5.2.1.orig/stlport/stl/_hashtable.c 2008-12-10 10:56:51.000000000 +0100 |
255 |
+++ stlport5.2-5.2.1/stlport/stl/_hashtable.c 2009-06-29 19:30:21.000000000 +0200 |
256 |
@@ -166,12 +166,12 @@ |
257 |
|
258 |
typename _BucketVector::const_iterator __bcur(__bpos); |
259 |
_BucketType *__pos_node = __pos._M_node; |
260 |
- for (--__bcur; __pos_node == *__bcur; --__bcur); |
261 |
+ for (--__bcur; __pos_node == *__bcur; --__bcur) ; |
262 |
|
263 |
__n = __bcur - __buckets.begin() + 1; |
264 |
_ElemsIte __cur(*__bcur); |
265 |
_ElemsIte __prev = __cur++; |
266 |
- for (; __cur != __pos; ++__prev, ++__cur); |
267 |
+ for (; __cur != __pos; ++__prev, ++__cur) ; |
268 |
return __prev; |
269 |
} |
270 |
|
271 |
@@ -345,7 +345,7 @@ |
272 |
else { |
273 |
_ElemsIte __last(_M_buckets[++__f_bucket]); |
274 |
__prev = __cur++; |
275 |
- for (; (__cur != __last) && (__cur != __first._M_ite); ++__prev, ++__cur); |
276 |
+ for (; (__cur != __last) && (__cur != __first._M_ite); ++__prev, ++__cur) ; |
277 |
} |
278 |
size_type __erased = 0; |
279 |
//We do not use the slist::erase_after method taking a range to count the |
280 |
@@ -464,7 +464,7 @@ |
281 |
_ElemsIte __ite(__cur), __before_ite(__cur); |
282 |
for (++__ite; |
283 |
__ite != __last && _M_equals(_M_get_key(*__cur), _M_get_key(*__ite)); |
284 |
- ++__ite, ++__before_ite); |
285 |
+ ++__ite, ++__before_ite) ; |
286 |
size_type __prev_bucket = __new_bucket; |
287 |
_ElemsIte __prev = _S_before_begin(__tmp_elems, __tmp, __prev_bucket)._M_ite; |
288 |
__tmp_elems.splice_after(__prev, _M_elems, _M_elems.before_begin(), __before_ite); |
289 |
Index: stlport5.2-5.2.1/stlport/stl/_hashtable.h |
290 |
=================================================================== |
291 |
--- stlport5.2-5.2.1.orig/stlport/stl/_hashtable.h 2008-12-10 10:56:51.000000000 +0100 |
292 |
+++ stlport5.2-5.2.1/stlport/stl/_hashtable.h 2009-06-29 19:30:21.000000000 +0200 |
293 |
@@ -499,7 +499,7 @@ |
294 |
size_type __n = _M_bkt_num_key(__key); |
295 |
_ElemsIte __first(_M_buckets[__n]); |
296 |
_ElemsIte __last(_M_buckets[__n + 1]); |
297 |
- for ( ; (__first != __last) && !_M_equals(_M_get_key(*__first), __key); ++__first); |
298 |
+ for ( ; (__first != __last) && !_M_equals(_M_get_key(*__first), __key); ++__first) ; |
299 |
if (__first != __last) |
300 |
return __first; |
301 |
else |
302 |
@@ -523,7 +523,7 @@ |
303 |
size_type __result = 1; |
304 |
for (++__cur; |
305 |
__cur != __last && _M_equals(_M_get_key(*__cur), __key); |
306 |
- ++__result, ++__cur); |
307 |
+ ++__result, ++__cur) ; |
308 |
return __result; |
309 |
} |
310 |
} |
311 |
@@ -539,7 +539,7 @@ |
312 |
__first != __last; ++__first) { |
313 |
if (_M_equals(_M_get_key(*__first), __key)) { |
314 |
_ElemsIte __cur(__first); |
315 |
- for (++__cur; (__cur != __last) && _M_equals(_M_get_key(*__cur), __key); ++__cur); |
316 |
+ for (++__cur; (__cur != __last) && _M_equals(_M_get_key(*__cur), __key); ++__cur) ; |
317 |
return _Pii(__first, __cur); |
318 |
} |
319 |
} |
320 |
@@ -555,7 +555,7 @@ |
321 |
__first != __last; ++__first) { |
322 |
if (_M_equals(_M_get_key(*__first), __key)) { |
323 |
_ElemsIte __cur(__first); |
324 |
- for (++__cur; (__cur != __last) && _M_equals(_M_get_key(*__cur), __key); ++__cur); |
325 |
+ for (++__cur; (__cur != __last) && _M_equals(_M_get_key(*__cur), __key); ++__cur) ; |
326 |
return _Pii(__first, __cur); |
327 |
} |
328 |
} |
329 |
Index: stlport5.2-5.2.1/stlport/stl/_list.c |
330 |
=================================================================== |
331 |
--- stlport5.2-5.2.1.orig/stlport/stl/_list.c 2008-12-10 10:56:51.000000000 +0100 |
332 |
+++ stlport5.2-5.2.1/stlport/stl/_list.c 2009-06-29 19:30:21.000000000 +0200 |
333 |
@@ -95,7 +95,7 @@ |
334 |
void list<_Tp, _Alloc>::resize(size_type __new_size, const _Tp& __x) { |
335 |
iterator __i = begin(); |
336 |
size_type __len = 0; |
337 |
- for ( ; __i != end() && __len < __new_size; ++__i, ++__len); |
338 |
+ for ( ; __i != end() && __len < __new_size; ++__i, ++__len) ; |
339 |
|
340 |
if (__len == __new_size) |
341 |
erase(__i, end()); |
342 |
Index: stlport5.2-5.2.1/stlport/stl/_string.c |
343 |
=================================================================== |
344 |
--- stlport5.2-5.2.1.orig/stlport/stl/_string.c 2008-12-10 10:56:51.000000000 +0100 |
345 |
+++ stlport5.2-5.2.1/stlport/stl/_string.c 2009-06-29 19:30:21.000000000 +0200 |
346 |
@@ -110,7 +110,7 @@ |
347 |
template <class _InputIter, class _CharT, class _Tp, class _Traits> |
348 |
inline _InputIter __str_find_first_not_of_aux2(_InputIter __first1, _InputIter __last1, |
349 |
const _CharT* __first2, const _CharT* __last2, |
350 |
- _Tp* __pt, _Traits* __traits) { |
351 |
+ _Tp*, _Traits* __traits) { |
352 |
typedef typename _IsIntegral<_Tp>::_Ret _IsIntegral; |
353 |
typedef typename _IsCharLikeType<_CharT>::_Ret _IsCharLike; |
354 |
typedef typename _Land2<_IsIntegral, _IsCharLike>::_Ret _UseStrcspnLikeAlgo; |
355 |
Index: stlport5.2-5.2.1/stlport/stl/_string_base.h |
356 |
=================================================================== |
357 |
--- stlport5.2-5.2.1.orig/stlport/stl/_string_base.h 2008-12-10 10:56:51.000000000 +0100 |
358 |
+++ stlport5.2-5.2.1/stlport/stl/_string_base.h 2009-06-29 19:30:21.000000000 +0200 |
359 |
@@ -69,7 +69,7 @@ |
360 |
_Tp* _M_End() |
361 |
{ return _M_using_static_buf() ? _M_buffers._M_static_buf + _DEFAULT_SIZE : _M_buffers._M_end_of_storage; } |
362 |
size_type _M_capacity() const |
363 |
- { return _M_using_static_buf() ? _DEFAULT_SIZE : _M_buffers._M_end_of_storage - _M_start_of_storage._M_data; } |
364 |
+ { return _M_using_static_buf() ? _DEFAULT_SIZE + 0 : _M_buffers._M_end_of_storage - _M_start_of_storage._M_data; } |
365 |
size_type _M_rest() const |
366 |
{ return _M_using_static_buf() ? _DEFAULT_SIZE - (_M_finish - _M_buffers._M_static_buf) : _M_buffers._M_end_of_storage - _M_finish; } |
367 |
#else |
368 |
Index: stlport5.2-5.2.1/stlport/stl/debug/_debug.h |
369 |
=================================================================== |
370 |
--- stlport5.2-5.2.1.orig/stlport/stl/debug/_debug.h 2009-06-29 19:29:13.000000000 +0200 |
371 |
+++ stlport5.2-5.2.1/stlport/stl/debug/_debug.h 2009-06-29 19:30:21.000000000 +0200 |
372 |
@@ -438,6 +438,7 @@ |
373 |
|
374 |
#else |
375 |
# define _STLP_VERBOSE_ASSERT(expr, diagnostic) |
376 |
+# define _STLP_VERBOSE_PARAM(param) |
377 |
# define _STLP_DEBUG_CHECK(expr) |
378 |
#endif /* _STLP_DEBUG */ |
379 |
|
380 |
|
381 |
|
382 |
|
383 |
1.1 src/patchsets/STLport/5.2.1/patches/11_all_5.2.1-quote_cxx_version.diff |
384 |
|
385 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/11_all_5.2.1-quote_cxx_version.diff?rev=1.1&view=markup |
386 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/11_all_5.2.1-quote_cxx_version.diff?rev=1.1&content-type=text/plain |
387 |
|
388 |
Index: 11_all_5.2.1-quote_cxx_version.diff |
389 |
=================================================================== |
390 |
diff --git a/build/Makefiles/gmake/CC.mak b/build/Makefiles/gmake/CC.mak |
391 |
index 8383bb1..6e0e56b 100644 |
392 |
--- a/build/Makefiles/gmake/CC.mak |
393 |
+++ b/build/Makefiles/gmake/CC.mak |
394 |
@@ -25,9 +25,9 @@ endif |
395 |
|
396 |
CXX_VERSION := $(shell ${CXX} -V 2>&1 | grep ${CXX} | awk '{ print $$4; }') |
397 |
|
398 |
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }') |
399 |
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }') |
400 |
-CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { if (NF > 2) {print $$3;}else{print "0"} }') |
401 |
+CXX_VERSION_MAJOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$1; }') |
402 |
+CXX_VERSION_MINOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$2; }') |
403 |
+CXX_VERSION_PATCH := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { if (NF > 2) {print $$3;}else{print "0"} }') |
404 |
|
405 |
DEFS ?= |
406 |
OPT ?= |
407 |
diff --git a/build/Makefiles/gmake/aCC.mak b/build/Makefiles/gmake/aCC.mak |
408 |
index 1ecbd14..c8853dd 100644 |
409 |
--- a/build/Makefiles/gmake/aCC.mak |
410 |
+++ b/build/Makefiles/gmake/aCC.mak |
411 |
@@ -25,8 +25,8 @@ CXX_VERSION := $(shell ${CXX} --version 2>&1 | grep ${CXX} | awk '{ print $$6; } |
412 |
ifeq ($(CXX_VERSION),) |
413 |
CXX_VERSION := $(shell ${CXX} --version) |
414 |
endif |
415 |
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }') |
416 |
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }') |
417 |
+CXX_VERSION_MAJOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$2; }') |
418 |
+CXX_VERSION_MINOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$3; }') |
419 |
|
420 |
DEFS ?= |
421 |
OPT ?= |
422 |
diff --git a/build/Makefiles/gmake/gcc.mak b/build/Makefiles/gmake/gcc.mak |
423 |
index 16ec435..8afa377 100644 |
424 |
--- a/build/Makefiles/gmake/gcc.mak |
425 |
+++ b/build/Makefiles/gmake/gcc.mak |
426 |
@@ -32,9 +32,9 @@ AS := ${TARGET_OS}-${AS} |
427 |
endif |
428 |
|
429 |
CXX_VERSION := $(shell ${CXX} -dumpversion) |
430 |
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }') |
431 |
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }') |
432 |
-CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }') |
433 |
+CXX_VERSION_MAJOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$1; }') |
434 |
+CXX_VERSION_MINOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$2; }') |
435 |
+CXX_VERSION_PATCH := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$3; }') |
436 |
|
437 |
# Check that we need option -fuse-cxa-atexit for compiler |
438 |
_CXA_ATEXIT := $(shell ${CXX} -v 2>&1 | grep -q -e "--enable-__cxa_atexit" || echo "-fuse-cxa-atexit") |
439 |
diff --git a/build/Makefiles/gmake/icc.mak b/build/Makefiles/gmake/icc.mak |
440 |
index 8b0c47c..25b6322 100644 |
441 |
--- a/build/Makefiles/gmake/icc.mak |
442 |
+++ b/build/Makefiles/gmake/icc.mak |
443 |
@@ -25,9 +25,9 @@ ifeq (${CXX_VERSION},) |
444 |
CXX_VERSION := $(shell ${CXX} --version) |
445 |
endif |
446 |
|
447 |
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }') |
448 |
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }') |
449 |
-# CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }') |
450 |
+CXX_VERSION_MAJOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$1; }') |
451 |
+CXX_VERSION_MINOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$2; }') |
452 |
+# CXX_VERSION_PATCH := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$3; }') |
453 |
|
454 |
SYSINCLUDES := -I$(shell which icpc | xargs dirname | xargs dirname)/include/c++ |
455 |
|
456 |
|
457 |
|
458 |
|
459 |
1.1 src/patchsets/STLport/5.2.1/patches/12_all_5.2.1-overwrite_all_libdir.diff |
460 |
|
461 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/12_all_5.2.1-overwrite_all_libdir.diff?rev=1.1&view=markup |
462 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/12_all_5.2.1-overwrite_all_libdir.diff?rev=1.1&content-type=text/plain |
463 |
|
464 |
Index: 12_all_5.2.1-overwrite_all_libdir.diff |
465 |
=================================================================== |
466 |
diff --git a/configure b/configure |
467 |
index 3f4f286..71f3eca 100755 |
468 |
--- a/configure |
469 |
+++ b/configure |
470 |
@@ -255,6 +255,8 @@ do |
471 |
;; |
472 |
--libdir=*) |
473 |
write_option "$option" INSTALL_LIB_DIR '${DESTDIR}' |
474 |
+ write_option "$option" INSTALL_LIB_DIR_DBG '${DESTDIR}' |
475 |
+ write_option "$option" INSTALL_LIB_DIR_STLDBG '${DESTDIR}' |
476 |
;; |
477 |
--includedir=*) |
478 |
write_option "$option" INSTALL_HDR_DIR '${DESTDIR}' |